--- rpl/tools/Attic/Makefile.in	2010/04/07 13:33:40	1.11
+++ rpl/tools/Attic/Makefile.in	2010/04/17 18:57:45	1.12
@@ -74,6 +74,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
+EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -101,7 +102,6 @@ LDFLAGS = @LDFLAGS@
 LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOLIZE = @LIBTOOLIZE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -109,6 +109,7 @@ MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
+NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
 OBJEXT = @OBJEXT@
 OPENSSL = @OPENSSL@
 OS = @OS@
@@ -127,6 +128,7 @@ RANLIB = @RANLIB@
 READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
+SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
@@ -383,57 +385,9 @@ uninstall-am:
 
 
 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 s/DREADLINE/UREADLINE/g @UNITS@/Makefile > $$TMP; \
+	\mv -f $$TMP @UNITS@/Makefile
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
@@ -441,19 +395,19 @@ all:
 	if [ ! -f @OPENSSL@/tests_success ]; then \
 		(cd @OPENSSL@ && $(MAKE) test && touch tests_success); \
 	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
 	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
-			$(top_builddir)/tools/@FILE@/src/file.o \
-			$(top_builddir)/tools/@FILE@/src/.libs/librplfile.a \
+			$(top_builddir)/tools/@FILE@/src/*.o \
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2) $(LDFLAGS)
 
 clean distclean:
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Cleaning $$subdir"; \
-		$(MAKE) -C $$subdir $@; \
+		if [ $$subdir = @OPENSSL@ ]; then \
+			$(MAKE) -C $$subdir -j1 $@; \
+		else \
+			$(MAKE) -C $$subdir $@; \
+		fi;
 	done;
 	\rm @OPENSSL@/tests_success