--- rpl/tools/Makefile.am 2011/11/26 13:05:03 1.54 +++ rpl/tools/Makefile.am 2015/03/18 10:41:29 1.126 @@ -1,66 +1,92 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \ @GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \ @FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.gz \ - @OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \ - @NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \ - @NCURSES@-20110423.patch.gz @NCURSES@-20110430.patch.gz \ - @NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \ - @NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \ - @NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \ - @NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \ - @NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \ - @NCURSES@-20110723.patch.gz @NCURSES@-20110730.patch.gz \ - @NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \ - @NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \ - @NCURSES@-20110910.patch.gz @NCURSES@-20110917.patch.gz \ - @NCURSES@-20110924.patch.gz @NCURSES@-20110925.patch.gz \ - @NCURSES@-20111001.patch.gz @NCURSES@-20111008.patch.gz \ - @NCURSES@-20111015.patch.gz @NCURSES@-20111022.patch.gz \ - @NCURSES@-20111030.patch.gz @NCURSES@-20111112.patch.gz \ - @NCURSES@-20111119.patch.gz openmotif.lib + @OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.gz \ + @NCURSES@-20120616.sh.gz \ + @NCURSES@-20120622.patch.gz @NCURSES@-20120630.patch.gz \ + @NCURSES@-20120707.patch.gz @NCURSES@-20120714.patch.gz \ + @NCURSES@-20120721.patch.gz @NCURSES@-20120728.patch.gz \ + @NCURSES@-20120804.patch.gz @NCURSES@-20120811.patch.gz \ + @NCURSES@-20120825.patch.gz @NCURSES@-20120826.patch.gz \ + @NCURSES@-20120901.patch.gz @NCURSES@-20120902.patch.gz \ + @NCURSES@-20120903.patch.gz @NCURSES@-20120908.patch.gz \ + @NCURSES@-20120922.patch.gz @NCURSES@-20121006.patch.gz \ + @NCURSES@-20121013.patch.gz @NCURSES@-20121017.patch.gz \ + @NCURSES@-20121026.patch.gz @NCURSES@-20121102.patch.gz \ + @NCURSES@-20121110.patch.gz @NCURSES@-20121117.patch.gz \ + @NCURSES@-20121124.patch.gz @NCURSES@-20121201.patch.gz \ + @NCURSES@-20121208.patch.gz @NCURSES@-20121215.patch.gz \ + @NCURSES@-20121222.patch.gz @NCURSES@-20121229.patch.gz \ + @NCURSES@-20130105.patch.gz @NCURSES@-20130112.patch.gz \ + @NCURSES@-20130119.patch.gz @NCURSES@-20130126.patch.gz \ + @NCURSES@-20130202.patch.gz @NCURSES@-20130209.patch.gz \ + @NCURSES@-20130216.patch.gz @NCURSES@-20130218.patch.gz \ + @NCURSES@-20130302.patch.gz @NCURSES@-20130309.patch.gz \ + @NCURSES@-20130316.patch.gz @NCURSES@-20130323.patch.gz \ + @NCURSES@-20130324.patch.gz @NCURSES@-20130406.patch.gz \ + @NCURSES@-20130413.patch.gz @NCURSES@-20130427.patch.gz \ + @NCURSES@-20130504.patch.gz @NCURSES@-20130511.patch.gz \ + @NCURSES@-20130518.patch.gz @NCURSES@-20130525.patch.gz \ + @NCURSES@-20130608.patch.gz @NCURSES@-20130615.patch.gz \ + @NCURSES@-20130622.patch.gz @NCURSES@-20130706.patch.gz \ + @NCURSES@-20130713.patch.gz @NCURSES@-20130720.patch.gz \ + @NCURSES@-20130727.patch.gz @NCURSES@-20130805.patch.gz \ + @NCURSES@-20130816.patch.gz @NCURSES@-20130824.patch.gz \ + @NCURSES@-20130831.patch.gz @NCURSES@-20130907.patch.gz \ + @NCURSES@-20130921.patch.gz @NCURSES@-20130928.patch.gz \ + @NCURSES@-20131005.patch.gz @NCURSES@-20131012.patch.gz \ + @NCURSES@-20131014.patch.gz @NCURSES@-20131019.patch.gz \ + @NCURSES@-20131027.patch.gz @NCURSES@-20131102.patch.gz \ + @NCURSES@-20131110.patch.gz @NCURSES@-20131116.patch.gz \ + @NCURSES@-20131123.patch.gz @NCURSES@-20131207.patch.gz \ + @NCURSES@-20131214.patch.gz @NCURSES@-20131221.patch.gz \ + @NCURSES@-20140118.patch.gz @NCURSES@-20140125.patch.gz \ + @NCURSES@-20140201.patch.gz @NCURSES@-20140209.patch.gz \ + @NCURSES@-20140215.patch.gz @NCURSES@-20140222.patch.gz \ + @NCURSES@-20140301.patch.gz @NCURSES@-20140308.patch.gz \ + @NCURSES@-20140315.patch.gz @NCURSES@-20140322.patch.gz \ + @NCURSES@-20140323.patch.gz @NCURSES@-20140329.patch.gz \ + @NCURSES@-20140412.patch.gz @NCURSES@-20140419.patch.gz \ + @NCURSES@-20140426.patch.gz @NCURSES@-20140503.patch.gz \ + @NCURSES@-20140510.patch.gz @NCURSES@-20140524.patch.gz \ + @NCURSES@-20140607.patch.gz @NCURSES@-20140609.patch.gz \ + @NCURSES@-20140614.patch.gz @NCURSES@-20140621.patch.gz \ + @NCURSES@-20140629.patch.gz @NCURSES@-20140705.patch.gz \ + @NCURSES@-20140712.patch.gz @NCURSES@-20140719.patch.gz \ + @NCURSES@-20140726.patch.gz @NCURSES@-20140802.patch.gz \ + @NCURSES@-20140809.patch.gz @NCURSES@-20140816.patch.gz \ + @NCURSES@-20140823.patch.gz @NCURSES@-20140831.patch.gz \ + @NCURSES@-20140906.patch.gz @NCURSES@-20140913.patch.gz \ + @NCURSES@-20140920.patch.gz @NCURSES@-20140927.patch.gz \ + @NCURSES@-20141011.patch.gz @NCURSES@-20141018.patch.gz \ + @NCURSES@-20141025.patch.gz @NCURSES@-20141101.patch.gz \ + @NCURSES@-20141115.patch.gz @NCURSES@-20141129.patch.gz \ + @NCURSES@-20141206.patch.gz @NCURSES@-20141213.patch.gz \ + @NCURSES@-20141220.patch.gz @NCURSES@-20141221.patch.gz \ + @NCURSES@-20141227.patch.gz @NCURSES@-20150103.patch.gz \ + @NCURSES@-20150110.patch.gz @NCURSES@-20150117.patch.gz \ + @NCURSES@-20150124.patch.gz @NCURSES@-20150131.patch.gz \ + @NCURSES@-20150214.patch.gz @NCURSES@-20150221.patch.gz \ + @NCURSES@-20150228.patch.gz @NCURSES@-20150307.patch.gz subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ \ + @ZLIB@ all: - TMP=tmp.tools; \ - sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \ - sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \ - mv -f $$TMP @UNITS@/Makefile - @list='$(subdirs)'; for subdir in $$list; do \ - echo "Making $@ in $$subdir"; \ - if [ $$subdir = @OPENSSL@ ]; then \ - if [ @OS@ = "OS2" ]; then \ - $(MAKE) -C $$subdir -j1 -f OS2-EMX.mak2; \ - else \ - $(MAKE) -C $$subdir -j1 $@; \ - fi; \ - else \ - if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \ - TMP=tmp.units; \ - sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \ - @UNITS@/Makefile > $$TMP; \ - mv -f $$TMP @UNITS@/Makefile; \ - fi; \ - $(MAKE) -C $$subdir $@; \ - fi; \ - done; - if [ ! -f @OPENSSL@/tests_success ]; then \ - if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \ - (cd @OPENSSL@ && touch tests_success); \ - else \ - (cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \ - fi; \ - fi - touch openmotif.lib && rm openmotif.lib; + test -f openmotif.lib && rm -f openmotif.lib; if [ x"@BUILD_OPENMOTIF@" = x ]; then \ touch openmotif.lib; \ else \ echo -n LD_MOTIF_ > openmotif.lib; \ - grep "^LIBS=" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \ + grep "^LIBS=" @OPENMOTIF@/config.log | \ + tr -d "'" >> openmotif.lib; \ echo -n LD_MOTIF_ >> openmotif.lib; \ - grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \ + grep "^X_XMU" @OPENMOTIF@/config.log | \ + tr -d "'" >> openmotif.lib; \ fi + if [ x"@GNUPLOT_COMPILATION@" != x ]; then \ + $(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi clean distclean: @list='$(subdirs)'; for subdir in $$list; do \ @@ -72,13 +98,20 @@ clean distclean: if [ -f @OPENSSL@/tests_success ]; then \ rm -f @OPENSSL@/tests_success; \ fi + rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/rplpp$(EXEEXT) + rm -f $(DESTDIR)$(bindir)/rplfile$(EXEEXT) install: all $(mkinstalldirs) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(UNITS)/units$(EXEEXT) \ $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) $(mkinstalldirs) $(DESTDIR)$(datadir) - $(INSTALL_DATA) $(srcdir)/$(UNITS)/units.dat $(DESTDIR)$(datadir)/rplunits + $(INSTALL_DATA) $(srcdir)/$(UNITS)/definitions.units \ + $(DESTDIR)$(datadir)/rplunits.tmp + sed 's/^!include currency.units//g' $(DESTDIR)$(datadir)/rplunits.tmp \ + > $(DESTDIR)$(datadir)/rplunits + rm -f $(DESTDIR)$(datadir)/rplunits.tmp $(INSTALL_PROGRAM) $(GPP)/src/gpp$(EXEEXT) \ $(DESTDIR)$(bindir)/rplpp$(EXEEXT) $(mkinstalldirs) $(DESTDIR)$(mandir)/man1