--- rpl/tools/Makefile.am	2010/03/27 10:23:34	1.9
+++ rpl/tools/Makefile.am	2013/03/03 11:38:50	1.86
@@ -1,86 +1,68 @@
 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 \
+		@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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 all:
-	for i in $(shell find @NCURSES@ -name Makefile \
-		 -exec grep static {} /dev/null \; | cut -d: -f1); \
-	do \
-		echo -n Checking $$i; \
-		TMP=$$(mktemp); \
-		if [ -n "$$(grep static $$i | grep dynamic)" ]; then \
-			awk \
-			'{ \
-				if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
-				{ \
-					for(j = 1; j <= NF; j++) \
-					{ \
-						if (index($$j, "-static") == 0) \
-						{ \
-							printf("%s ", $$j); \
-						} \
-					} \
-					printf("\n"); \
-				} \
-				else \
-				{ \
-					print; \
-				} \
-			}' $$i > $$TMP; \
-			\mv -f $$TMP $$i; \
-			echo -n " (fixed)"; \
-		else \
-			echo -n " (nothing to do)"; \
-		fi; \
-		echo .; \
-	done;
-	TMP=$$(mktemp); \
-	awk \
-	'{ \
-		if (index($$0, "LDFLAGS") == 1) \
-		{ \
-			if (index($$0, "-static") == 0) \
-			{ \
-				printf("%s -static\n", $$0); \
-			} \
-			else \
-			{ \
-				print; \
-			} \
-		} \
-		else \
-		{ \
-			print; \
-		} \
-	}' @FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP @FILE@/src/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
-	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \
-			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
-	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+	if [ @GNUPLOT_COMPILATION@ ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		if [ @SQLITE@ != $$subdir ]; then $(MAKE) -C $$subdir $@; fi; \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir $@; \
+		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
@@ -90,11 +72,11 @@ install: all
 			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
-	$(INSTALL_PROGRAM) $(FILE)/src/.libs/rplfile$(EXEEXT) \
-			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
+	$(INSTALL_PROGRAM) $(FILE)/src/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 \