--- rpl/tools/Makefile.am	2010/05/09 15:43:50	1.14
+++ rpl/tools/Makefile.am	2010/07/31 10:34:25	1.18
@@ -7,11 +7,16 @@ subdirs = @NCURSES@ @READLINE@ @UNITS@ @
 
 all:
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
-	sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \
+	sed s/DREADLINE/UREADLINE/g @UNITS@/Makefile | \
+			sed s/-lreadline//g | sed s/-lncurses//g > $$TMP; \
 	\mv -f $$TMP @UNITS@/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
-		$(MAKE) -C $$subdir $@ ; \
+		if [ $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir -j1 $@; \
+		else \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
 	if [ ! -f @OPENSSL@/tests_success ]; then \
 		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
@@ -24,9 +29,7 @@ all:
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		if [ $$subdir = @OPENSSL@ ]; then \
-			$(MAKE) -C $$subdir -j1 $@; \
-		else \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
 			$(MAKE) -C $$subdir $@; \
 		fi; \
 	done;