--- rpl/tools/Makefile.am	2010/12/21 13:58:16	1.26
+++ rpl/tools/Makefile.am	2012/03/31 09:58:45	1.61
@@ -1,12 +1,21 @@
 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 @SQLITE@.diff.gz @OPENSSL@.tar.gz
+		@FILE@.diff.gz @SQLITE@.tar.gz @OPENSSL@.tar.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
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
+		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 all:
-	TMP=$$(mktemp tmp.XXXXXXXXXX); \
+	TMP=tmp.tools; \
 	sed -e 's/DREADLINE/UREADLINE/g' @UNITS@/Makefile | \
 			sed -e 's/-lreadline//g' | sed -e 's/-lncurses//g' > $$TMP; \
 	mv -f $$TMP @UNITS@/Makefile
@@ -20,7 +29,7 @@ all:
 			fi; \
 		else \
 			if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
-				TMP=$$(mktemp tmp.XXXXXXXXXX); \
+				TMP=tmp.units; \
 				sed -e 's/^DEFS = -DUNITSFILE/DEFS = -Dmalloc=malloc -DUNITSFILE/g' \
 						@UNITS@/Makefile > $$TMP; \
 				mv -f $$TMP @UNITS@/Makefile; \
@@ -29,12 +38,21 @@ all:
 		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
-		if [ @OS@ = "OS2" ]; then \
+		if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \
 			(cd @OPENSSL@ && touch tests_success); \
 		else \
 			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
 		fi; \
 	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
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
@@ -46,6 +64,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)