--- rpl/tools/Makefile.am	2011/07/24 13:29:32	1.41
+++ rpl/tools/Makefile.am	2012/05/14 19:54:43	1.69
@@ -1,48 +1,35 @@
 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@-20110423.patch.gz @NCURSES@-20110430.patch.gz \
-		@NCURSES@-20110507.patch.gz @NCURSES@-20110514.patch.gz \
-		@NCURSES@-20110521.patch.gz @NCURSES@-20110528.patch.gz \
-		@NCURSES@-20110604.patch.gz @NCURSES@-20110611.patch.gz \
-		@NCURSES@-20110625.patch.gz @NCURSES@-20110626.patch.gz \
-		@NCURSES@-20110702.patch.gz @NCURSES@-20110716.patch.gz \
-		@NCURSES@-20110723.patch.gz
+		@OPENMOTIF@.tar.gz @SIGSEGV@.tar.gz @LIBXPM@.tar.gz \
+		@NCURSES@-20111224.sh.gz \
+		@NCURSES@-20111231.patch.gz @NCURSES@-20120107.patch.gz \
+		@NCURSES@-20120114.patch.gz @NCURSES@-20120121.patch.gz \
+		@NCURSES@-20120128.patch.gz @NCURSES@-20120204.patch.gz \
+		@NCURSES@-20120211.patch.gz @NCURSES@-20120218.patch.gz \
+		@NCURSES@-20120225.patch.gz @NCURSES@-20120228.patch.gz \
+		@NCURSES@-20120303.patch.gz @NCURSES@-20120310.patch.gz \
+		@NCURSES@-20120317.patch.gz @NCURSES@-20120324.patch.gz \
+		@NCURSES@-20120331.patch.gz @NCURSES@-20120407.patch.gz \
+		@NCURSES@-20120414.patch.gz	@NCURSES@-20120421.patch.gz \
+		@NCURSES@-20120428.patch.gz	@NCURSES@-20120505.patch.gz \
+		@NCURSES@-20120512.patch.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 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; \
+	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
+	if [ @GNUPLOT_COMPILATION@ ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
@@ -54,6 +41,9 @@ 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)