--- rpl/tools/Makefile.am 2013/09/01 08:14:30 1.101 +++ rpl/tools/Makefile.am 2018/02/09 09:41:04 1.153 @@ -2,51 +2,87 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@ @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 @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@-20150613.patch.gz @NCURSES@-20150627.patch.gz \ + @NCURSES@-20150704.patch.gz @NCURSES@-20150711.patch.gz \ + @NCURSES@-20150719.patch.gz @NCURSES@-20150725.patch.gz \ + @NCURSES@-20150808.patch.gz @NCURSES@-20150810.patch.gz \ + @NCURSES@-20150815.patch.gz @NCURSES@-20150822.patch.gz \ + @NCURSES@-20150905.patch.gz @NCURSES@-20150912.patch.gz \ + @NCURSES@-20150919.patch.gz @NCURSES@-20150926.patch.gz \ + @NCURSES@-20151010.patch.gz @NCURSES@-20151017.patch.gz \ + @NCURSES@-20151024.patch.gz @NCURSES@-20151101.patch.gz \ + @NCURSES@-20151107.patch.gz @NCURSES@-20151121.patch.gz \ + @NCURSES@-20151128.patch.gz @NCURSES@-20151205.patch.gz \ + @NCURSES@-20151212.patch.gz @NCURSES@-20151219.patch.gz \ + @NCURSES@-20151226.patch.gz @NCURSES@-20160102.patch.gz \ + @NCURSES@-20160116.patch.gz @NCURSES@-20160123.patch.gz \ + @NCURSES@-20160130.patch.gz @NCURSES@-20160206.patch.gz \ + @NCURSES@-20160213.patch.gz @NCURSES@-20160220.patch.gz \ + @NCURSES@-20160305.patch.gz @NCURSES@-20160312.patch.gz \ + @NCURSES@-20160319.patch.gz @NCURSES@-20160326.patch.gz \ + @NCURSES@-20160402.patch.gz @NCURSES@-20160409.patch.gz \ + @NCURSES@-20160416.patch.gz @NCURSES@-20160423.patch.gz \ + @NCURSES@-20160507.patch.gz @NCURSES@-20160514.patch.gz \ + @NCURSES@-20160521.patch.gz @NCURSES@-20160528.patch.gz \ + @NCURSES@-20160604.patch.gz @NCURSES@-20160611.patch.gz \ + @NCURSES@-20160618.patch.gz @NCURSES@-20160625.patch.gz \ + @NCURSES@-20160702.patch.gz @NCURSES@-20160709.patch.gz \ + @NCURSES@-20160723.patch.gz @NCURSES@-20160730.patch.gz \ + @NCURSES@-20160806.patch.gz @NCURSES@-20160813.patch.gz \ + @NCURSES@-20160820.patch.gz @NCURSES@-20160827.patch.gz \ + @NCURSES@-20160903.patch.gz @NCURSES@-20160910.patch.gz \ + @NCURSES@-20160917.patch.gz @NCURSES@-20160924.patch.gz \ + @NCURSES@-20161001.patch.gz @NCURSES@-20161008.patch.gz \ + @NCURSES@-20161015.patch.gz @NCURSES@-20161022.patch.gz \ + @NCURSES@-20161029.patch.gz @NCURSES@-20161105.patch.gz \ + @NCURSES@-20161112.patch.gz @NCURSES@-20161119.patch.gz \ + @NCURSES@-20161126.patch.gz @NCURSES@-20161203.patch.gz \ + @NCURSES@-20161210.patch.gz @NCURSES@-20161217.patch.gz \ + @NCURSES@-20161224.patch.gz @NCURSES@-20161231.patch.gz \ + @NCURSES@-20170107.patch.gz @NCURSES@-20170114.patch.gz \ + @NCURSES@-20170121.patch.gz @NCURSES@-20170128.patch.gz \ + @NCURSES@-20170204.patch.gz @NCURSES@-20170212.patch.gz \ + @NCURSES@-20170218.patch.gz @NCURSES@-20170225.patch.gz \ + @NCURSES@-20170304.patch.gz @NCURSES@-20170311.patch.gz \ + @NCURSES@-20170318.patch.gz @NCURSES@-20170325.patch.gz \ + @NCURSES@-20170401.patch.gz @NCURSES@-20170408.patch.gz \ + @NCURSES@-20170415.patch.gz @NCURSES@-20170422.patch.gz \ + @NCURSES@-20170429.patch.gz @NCURSES@-20170506.patch.gz \ + @NCURSES@-20170513.patch.gz @NCURSES@-20170520.patch.gz \ + @NCURSES@-20170527.patch.gz @NCURSES@-20170603.patch.gz \ + @NCURSES@-20170610.patch.gz @NCURSES@-20170617.patch.gz \ + @NCURSES@-20170624.patch.gz @NCURSES@-20170701.patch.gz \ + @NCURSES@-20170708.patch.gz @NCURSES@-20170715.patch.gz \ + @NCURSES@-20170722.patch.gz @NCURSES@-20170729.patch.gz \ + @NCURSES@-20170812.patch.gz @NCURSES@-20170819.patch.gz \ + @NCURSES@-20170826.patch.gz @NCURSES@-20170827.patch.gz \ + @NCURSES@-20170902.patch.gz @NCURSES@-20170909.patch.gz \ + @NCURSES@-20170916.patch.gz @NCURSES@-20170923.patch.gz \ + @NCURSES@-20170930.patch.gz @NCURSES@-20171007.patch.gz \ + @NCURSES@-20171014.patch.gz @NCURSES@-20171021.patch.gz \ + @NCURSES@-20171028.patch.gz @NCURSES@-20171104.patch.gz \ + @NCURSES@-20171111.patch.gz @NCURSES@-20171118.patch.gz \ + @NCURSES@-20171125.patch.gz @NCURSES@-20171209.patch.gz \ + @NCURSES@-20171216.patch.gz @NCURSES@-20171223.patch.gz \ + @NCURSES@-20171230.patch.gz @NCURSES@-20180106.patch.gz \ + @NCURSES@-20180120.patch.gz @NCURSES@-20180121.patch.gz \ + ncurses-6.1-20180127.patch.gz ncurses-6.1-20180129.patch.gz subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ \ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @BUILD_SIGSEGV@ @BUILD_OPENMOTIF@ \ @ZLIB@ all: - 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 @@ -58,6 +94,9 @@ clean distclean: $(MAKE) -C $$subdir $@; \ fi; \ done; + if [ -d @OPENMOTIF@/install ]; then \ + rm -rf @OPENMOTIF@/install; \ + fi if [ -f @OPENSSL@/tests_success ]; then \ rm -f @OPENSSL@/tests_success; \ fi