--- rpl/tools/Makefile.am	2012/05/14 10:49:26	1.66
+++ rpl/tools/Makefile.am	2012/05/14 19:54:43	1.69
@@ -19,35 +19,6 @@ subdirs = @NCURSES@ @READLINE@ @UNITS@ @
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@ @SIGSEGV@ @BUILD_OPENMOTIF@
 
 all:
-	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 \
-			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=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" -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; \
@@ -57,6 +28,8 @@ all:
 		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 \