--- rpl/Attic/Makefile.in	2010/03/01 14:48:13	1.6
+++ rpl/Attic/Makefile.in	2010/05/23 15:12:12	1.19
@@ -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@
@@ -179,18 +180,20 @@ INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LATEX = @LATEX@
 LDFLAGS = @LDFLAGS@
-LIBMTMALLOC = @LIBMTMALLOC@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
-LIBTOOLIZE = @LIBTOOLIZE@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
 NCURSES = @NCURSES@
+NESTED_FUNCTIONS = @NESTED_FUNCTIONS@
 OBJEXT = @OBJEXT@
+OPENSSL = @OPENSSL@
+OS = @OS@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
 PACKAGE_NAME = @PACKAGE_NAME@
@@ -206,8 +209,10 @@ RANLIB = @RANLIB@
 READLINE = @READLINE@
 RUNPATH = @RUNPATH@
 SED = @SED@
+SEMAPHORES_NOMMES = @SEMAPHORES_NOMMES@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
+SQLITE = @SQLITE@
 STRIP = @STRIP@
 TEX = @TEX@
 UNITS = @UNITS@
@@ -283,7 +288,9 @@ target_vendor = @target_vendor@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-SUBDIRS = tools lapack/blas lapack/lapack rpliconv src rpltags scripts man doc
+SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \
+		rpltags scripts man doc
+
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
 		COPYING.in lapack/COPYING lapack/RELEASE \
 		tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \
@@ -696,11 +703,6 @@ install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 
 installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
 mostlyclean-generic:
 
 clean-generic:
@@ -808,26 +810,64 @@ licences:
 
 toolsdistclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@; \
+			@FILE@ @ICONV@ @SQLITE@; \
 	do \
 		\rm -rf $(srcdir)/tools/$$i; \
 	done;
 
 toolsclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@; \
+			@FILE@ @ICONV@ @SQLITE@; \
 	do \
 		(cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \
 	done;
 
-tools:
-	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
-			@FILE@ @ICONV@; \
+$(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;
+	for i in tools/@NCURSES@/test/Makefile; \
+	do \
+		echo -n Checking $$i; \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		awk \
+			'/^TEST_ARGS/ \
+				{ printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \
+				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
+			! /^TEST_ARGS/ \
+				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
+		\mv -f $$TMP $$i; \
+		echo .; \
 	done;
-
-$(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
 	(cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))
 
 $(top_builddir)/tools/@READLINE@/libreadline.a \
@@ -840,9 +880,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))
@@ -850,30 +887,84 @@ $(top_builddir)/lapack/lapack/liblapack.
 $(top_builddir)/lapack/blas/libblas.a:
 	(cd $(top_builddir)/lapack/blas && $(MAKE) $(AM_MAKEFLAGS))
 
-$(top_builddir)/rpliconv/rpliconv: \
+$(top_builddir)/rpliconv/rpliconv$(EXEEXT): \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 	(cd $(top_builddir)/rpliconv && $(MAKE) $(AM_MAKEFLAGS))
 
 $(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))
 
-.NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile \
+$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
+	(cd $(top_builddir)/tools/@SQLITE@ && $(MAKE) $(AM_MAKEFLAGS))
+
+$(top_builddir)/tools/@OPENSSL@/libcrypto.a \
+		$(top_builddir)/tools/@OPENSSL@/libssl.a:
+	(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) $(AM_MAKEFLAGS))
+
+$(top_builddir)/ptmalloc3/libptmalloc3.a :
+		(cd $(top_builddir)/ptmalloc3 && $(MAKE) $(AM_MAKEFLAGS))
+
+$(top_builddir)/tools/rplsums/rplmd5sum \
+		$(top_builddir)/tools/rplsums/rplsha1sum: \
+		$(top_builddir)/tools/@OPENSSL@/libcrypto.a
+	(cd $(top_builddir)/rplsums && $(MAKE) $(AM_MAKEFLAGS))
+
+$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
+	(cd $(top_builddir)/tools/@GPP@ && $(MAKE) $(AM_MAKEFLAGS))
+
+.NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc
 
 .NOTPARALLEL: $(top_builddir)/tools/@READLINE@/libreadline.a \
 		$(top_builddir)/tools/@READLINE@/libhistory.a
 
+.NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/libcrypto.a \
+		$(top_builddir)/tools/@OPENSSL@/libssl.a
+
+.NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \
+		$(top_builddir)/tools/rplsums/rplsha1sum
+
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) install
+
 all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \
 		$(top_builddir)/tools/@READLINE@/libreadline.a \
 		$(top_builddir)/tools/@READLINE@/libhistory.a \
 		$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
+		$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a \
+		$(top_builddir)/tools/@OPENSSL@/libcrypto.a \
+		$(top_builddir)/tools/@OPENSSL@/libssl.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
-		$(top_builddir)/rpliconv/rpliconv \
-		$(top_builddir)/tools/@FILE@/src/rplfile \
-		$(top_builddir)/tools/@FILE@/magic/magic.mgc
+		$(top_builddir)/ptmalloc3/libptmalloc3.a \
+		$(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+		$(top_builddir)/tools/@FILE@/magic/magic.mgc \
+		$(top_builddir)/tools/rplsums/rplmd5sum \
+		$(top_builddir)/tools/rplsums/rplsha1sum \
+		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT)
 # Cette règle n'est là que pour forcer la compilation de Gnuplot.
 	(cd $(top_builddir)/tools && $(MAKE) $(AM_MAKEFLAGS))
 	(cd $(top_builddir)/rpltags && $(MAKE) $(AM_MAKEFLAGS))