--- rpl/tools/Makefile.am	2012/04/17 07:45:10	1.64
+++ rpl/tools/Makefile.am	2012/05/28 11:38:40	1.70
@@ -11,41 +11,14 @@ EXTRA_DIST = @NCURSES@.tar.gz @READLINE@
 		@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@-20120414.patch.gz	@NCURSES@-20120421.patch.gz \
+		@NCURSES@-20120428.patch.gz	@NCURSES@-20120505.patch.gz \
+		@NCURSES@-20120512.patch.gz @NCURSES@-20120526.patch.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@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; \
@@ -55,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 \