--- rpl/tools/Makefile.am	2011/06/01 08:19:22	1.37
+++ rpl/tools/Makefile.am	2016/04/01 10:16:28	1.135
@@ -1,44 +1,44 @@
 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 \
-		@NCURSES@-20110409.patch.gz @NCURSES@-20110416.patch.gz \
-		@NCURSES@-5.9-20110423.patch.gz @NCURSES@-5.9-20110430.patch.gz \
-		@NCURSES@-5.9-20110507.patch.gz @NCURSES@-5.9-20110514.patch.gz \
-		@NCURSES@-5.9-20110521.patch.gz @NCURSES@-5.9-20110528.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 \
+		@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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@ \
+		@ZLIB@
 
 all:
-	TMP=$$(mktemp tmp.XXXXXXXXXX); \
-	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=$$(mktemp tmp.XXXXXXXXXX); \
-				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" ]; then \
-			(cd @OPENSSL@ && touch tests_success); \
-		else \
-			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
-		fi; \
+	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; \
+		echo -n LD_MOTIF_ >> 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 \
@@ -50,13 +50,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