--- rpl/tools/Makefile.am	2010/03/17 14:08:30	1.7
+++ rpl/tools/Makefile.am	2011/02/18 09:19:50	1.27
@@ -6,73 +6,46 @@ subdirs = @NCURSES@ @READLINE@ @UNITS@ @
 		@FILE@ @ICONV@ @SQLITE@ @OPENSSL@
 
 all:
-	for i in $(shell find @NCURSES@ -name Makefile \
-		 -exec grep static {} /dev/null \; | cut -d: -f1); \
-	do \
-		echo -n Checking $$i; \
-		TMP=$$(mktemp); \
-		if [ -n "$$(grep static $$i | grep dynamic)" ]; then \
-			awk \
-			'{ \
-				if (index($$0, "-static") != 0 && index($$0, "-dynamic") != 0) \
-				{ \
-					for(j = 1; j <= NF; j++) \
-					{ \
-						if (index($$j, "-static") == 0) \
-						{ \
-							printf("%s ", $$j); \
-						} \
-					} \
-					printf("\n"); \
-				} \
-				else \
-				{ \
-					print; \
-				} \
-			}' $$i > $$TMP; \
-			\mv -f $$TMP $$i; \
-			echo -n " (fixed)"; \
-		else \
-			echo -n " (nothing to do)"; \
-		fi; \
-		echo .; \
-	done;
-	TMP=$$(mktemp); \
-	awk \
-	'{ \
-		if (index($$0, "LDFLAGS") == 1) \
-		{ \
-			if (index($$0, "-static") == 0) \
-			{ \
-				printf("%s -static\n", $$0); \
-			} \
-			else \
-			{ \
-				print; \
-			} \
-		} \
-		else \
-		{ \
-			print; \
-		} \
-	}' @FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP @FILE@/src/Makefile
+	TMP=$$(mktemp tmp.XXXXXXXXXX); \
+	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"; \
-		$(MAKE) -C $$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=$$(mktemp tmp.XXXXXXXXXX); \
+				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 \
-		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
+		if [ @OS@ = "OS2" ]; then \
+			(cd @OPENSSL@ && touch tests_success); \
+		else \
+			(cd @OPENSSL@ && $(MAKE) -j1 test && touch tests_success); \
+		fi; \
 	fi
-	$(AR) cru $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a \
-			$(top_builddir)/tools/@ICONV@/lib/.libs/*.o
-	$(RANLIB) $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		if [ @SQLITE@ != $$subdir ]; then $(MAKE) -C $$subdir $@; fi; \
+		if [ ! $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir $@; \
+		fi; \
 	done;
+	if [ -f @OPENSSL@/tests_success ]; then \
+		rm -f @OPENSSL@/tests_success; \
+	fi
 
 install: all
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -90,10 +63,10 @@ install: all
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
 	$(INSTALL_PROGRAM) $(FILE)/src/rplfile$(EXEEXT) \
-			$(DESTDIR)$(bindir)/rplfile$(EXEEXT);
+			$(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 \