--- rpl/tools/Makefile.am	2010/04/17 18:57:45	1.12
+++ rpl/tools/Makefile.am	2014/01/26 18:21:36	1.106
@@ -1,43 +1,88 @@
 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@-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@-20130907.patch.gz \
+		@NCURSES@-20130921.patch.gz @NCURSES@-20130928.patch.gz \
+		@NCURSES@-20131005.patch.gz @NCURSES@-20131012.patch.gz \
+		@NCURSES@-20131014.patch.gz @NCURSES@-20131019.patch.gz \
+		@NCURSES@-20131027.patch.gz @NCURSES@-20131102.patch.gz \
+		@NCURSES@-20131110.patch.gz @NCURSES@-20131116.patch.gz \
+		@NCURSES@-20131123.patch.gz @NCURSES@-20131207.patch.gz \
+		@NCURSES@-20131214.patch.gz @NCURSES@-20131221.patch.gz \
+		@NCURSES@-20140118.patch.gz @NCURSES@-20140125.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 s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \
-	\mv -f $$TMP @UNITS@/Makefile
-	@list='$(subdirs)'; for subdir in $$list; do \
-		echo "Making $@ in $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
-	done;
-	if [ ! -f @OPENSSL@/tests_success ]; then \
-		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+	touch openmotif.lib && rm 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;
+		fi; \
 	done;
-	\rm @OPENSSL@/tests_success
+	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
@@ -48,10 +93,10 @@ install: all
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
 	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
-			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
+			$(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 \