--- rpl/tools/Makefile.am	2010/08/09 13:52:29	1.21
+++ rpl/tools/Makefile.am	2011/10/05 13:14:19	1.51
@@ -1,15 +1,27 @@
 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@-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 @NCURSES@-20110730.patch.gz \
+		@NCURSES@-20110807.patch.gz @NCURSES@-20110813.patch.gz \
+		@NCURSES@-20110820.patch.gz @NCURSES@-20110903.patch.gz \
+		@NCURSES@-20110910.patch.gz openmotif.lib
 
 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 s/DREADLINE/UREADLINE/g @UNITS@/Makefile | \
-			sed s/-lreadline//g | sed s/-lncurses//g > $$TMP; \
-	\mv -f $$TMP @UNITS@/Makefile
+	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
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
 		if [ $$subdir = @OPENSSL@ ]; then \
@@ -19,20 +31,31 @@ all:
 				$(MAKE) -C $$subdir -j1 $@; \
 			fi; \
 		else \
+			if [ $$subdir = @UNITS@ -a @OS@ = OpenBSD ]; then \
+				TMP=tmp.units; \
+				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 \
+		if [ @OS@ = "OS2" -o @RPLTOOLS@ != '\$(top_builddir)' ]; then \
 			(cd @OPENSSL@ && touch tests_success); \
 		else \
-			(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
 		fi; \
 	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)
+	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 \
@@ -42,7 +65,7 @@ clean distclean:
 		fi; \
 	done;
 	if [ -f @OPENSSL@/tests_success ]; then \
-		\rm -f @OPENSSL@/tests_success; \
+		rm -f @OPENSSL@/tests_success; \
 	fi
 
 install: all
@@ -64,7 +87,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 \