--- rpl/tools/Makefile.am	2012/12/19 09:29:45	1.83
+++ rpl/tools/Makefile.am	2016/01/09 18:25:54	1.133
@@ -1,36 +1,38 @@
 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@-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
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz @ZLIB@.tar.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
 
 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;
+	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 [ @GNUPLOT_COMPILATION@ ]; then \
+	if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean: