--- rpl/tools/Makefile.am	2010/01/26 15:22:47	1.1.1.1
+++ rpl/tools/Makefile.am	2010/03/02 09:52:34	1.4
@@ -1,17 +1,45 @@
 EXTRA_DIST = @NCURSES@.tar.gz @READLINE@.tar.gz @UNITS@.tar.gz @GSL@.tar.gz \
-		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz
+		@GPP@.tar.gz @GNUPLOT@.tar.gz @FILE@.tar.gz @ICONV@.tar.gz \
+		@FILE@.diff.gz
 
 subdirs = @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 		@FILE@ @ICONV@
 
 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;
 	@list='$(subdirs)'; for subdir in $$list; do \
 		echo "Making $@ in $$subdir"; \
 		$(MAKE) -C $$subdir $@ ; \
 	done;
-	$(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 \
@@ -28,7 +56,8 @@ install: all
 	$(mkinstalldirs) $(DESTDIR)$(mandir)/man1
 	$(INSTALL_DATA) $(srcdir)/$(GPP)/doc/gpp.1 $(DESTDIR)$(mandir)/man1
 	ln -sf $(DESTDIR)$(mandir)/man1/gpp.1 $(DESTDIR)$(mandir)/man1/rplpp.1
-	if [ @GNUPLOT_COMPILATION@ ]; then $(MAKE) -C @GNUPLOT@ $@; fi
+	if [ @GNUPLOT_COMPILATION@ ]; then \
+			$(MAKE) $(AM_MAKEFLAGS) -C @GNUPLOT@ $@; fi
 	$(INSTALL_DATA) $(FILE)/magic/magic.mgc \
 			$(DESTDIR)$(datadir)/rplfiles.mgc
 	if [ -z "$(head -n1 $(FILE)/src/file | grep '^#!')" ]; then \