--- rpl/tools/Makefile.am	2010/07/28 10:31:29	1.17
+++ rpl/tools/Makefile.am	2017/07/11 16:04:54	1.148
@@ -1,50 +1,104 @@
 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
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.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 \
+		@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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @BUILD_SIGSEGV@ @BUILD_OPENMOTIF@ \
+		@ZLIB@
 
 all:
-	TMP=$$(mktemp tmp.XXXXXXXXXX); \
-	sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile | \
-			sed s/-lreadline//g | sed s/-lncurses//g > $$TMP; \
-	\mv -f $$TMP @UNITS@/Makefile
-	@list='$(subdirs)'; for subdir in $$list; do \
-		echo "Making $@ in $$subdir"; \
-		if [ $$subdir = @OPENSSL@ ]; then \
-			$(MAKE) -C $$subdir -j1 $@; \
-		else \
-			$(MAKE) -C $$subdir $@; \
-		fi; \
-	done;
-	if [ ! -f @OPENSSL@/tests_success ]; then \
-		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+	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
-	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/*.o \
-			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
-			cut -d= -f2) $(LDFLAGS)
+	if [ x"@GNUPLOT_COMPILATION@" != x ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		if [ $$subdir = @OPENSSL@ ]; then \
-			$(MAKE) -C $$subdir -j1 $@; \
-		else \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
 			$(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; \
+		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
@@ -58,7 +112,7 @@ install: all
 			$(DESTDIR)$(bindir)/rplfile$(EXEEXT)
 
 uninstall:
-	\rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
+	rm -f $(DESTDIR)$(bindir)/rplconvert$(EXEEXT) \
 			$(DESTDIR)$(datadir)/rplunits \
 			$(DESTDIR)$(bindir)/rplpp$(EXEEXT) \
 			$(DESTDIR)$(mandir)/man1/gpp.1 \