--- rpl/Attic/Makefile.in	2010/04/07 07:16:10	1.11
+++ rpl/Attic/Makefile.in	2010/04/17 18:57:33	1.12
@@ -155,6 +155,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@
+EXPORT_DYNAMIC = @EXPORT_DYNAMIC@
 F77 = @F77@
 FC = @FC@
 FCFLAGS = @FCFLAGS@
@@ -182,7 +183,6 @@ LDFLAGS = @LDFLAGS@
 LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOLIZE = @LIBTOOLIZE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
@@ -190,6 +190,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@
@@ -208,6 +209,7 @@ RANLIB = @RANLIB@
 READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
+SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 SQLITE = @SQLITE@
@@ -825,14 +827,39 @@ toolsclean:
 		(cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \
 	done;
 
-tools:
-	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@ @SQLITE@; \
+$(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
+	for i in $(shell find tools/@NCURSES@ -name Makefile \
+		 -exec grep static {} /dev/null \; | cut -d: -f1); \
 	do \
-		(cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) all); \
+		echo -n Checking $$i; \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		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)"; \
+			\rm -f $$TMP; \
+		fi; \
+		echo .; \
 	done;
-
-$(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
 	(cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))
 
 $(top_builddir)/tools/@READLINE@/libreadline.a \
@@ -845,9 +872,6 @@ $(top_builddir)/tools/@GSL@/.libs/libgsl
 $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:
 # La dépendance est faite par rpliconv.
 	(cd $(top_builddir)/tools/@ICONV@ && $(MAKE) $(AM_MAKEFLAGS))
-	$(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
 
 $(top_builddir)/lapack/lapack/liblapack.a:
 	(cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS))
@@ -862,6 +886,26 @@ $(top_builddir)/rpliconv/rpliconv: \
 $(top_builddir)/tools/@FILE@/src/rplfile \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+	TMP=$$(mktemp tmp.XXXXXXXXXX); \
+	awk \
+	'{ \
+		if (index($$0, "LDFLAGS") == 1) \
+		{ \
+			if (index($$0, "-static") == 0) \
+			{ \
+				printf("%s -static\n", $$0); \
+			} \
+			else \
+			{ \
+				print; \
+			} \
+		} \
+		else \
+		{ \
+			print; \
+		} \
+	}' tools/@FILE@/src/Makefile > $$TMP; \
+	\mv -f $$TMP tools/@FILE@/src/Makefile
 	(cd $(top_builddir)/tools/@FILE@ && $(MAKE) $(AM_MAKEFLAGS))
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a: