--- rpl/tools/Makefile.am 2013/03/17 22:26:44 1.88 +++ rpl/tools/Makefile.am 2013/06/21 12:34:17 1.97 @@ -1,7 +1,7 @@ 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 \ + @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 \ @@ -22,10 +22,16 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@ @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@-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 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \ - @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ + @FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ \ + @ZLIB@ all: touch openmotif.lib && rm openmotif.lib; @@ -37,7 +43,7 @@ all: echo -n LD_MOTIF_ >> openmotif.lib; \ grep "^X_XMU" @OPENMOTIF@/config.log | tr -d "'" >> openmotif.lib; \ fi - if [ @GNUPLOT_COMPILATION@ ]; then \ + if [ x"@GNUPLOT_COMPILATION@" != x ]; then \ $(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi clean distclean: