--- rpl/src/Attic/Makefile.in	2010/05/09 15:43:15	1.24
+++ rpl/src/Attic/Makefile.in	2010/05/24 20:07:11	1.31
@@ -387,8 +387,7 @@ nodist_rpl_OBJECTS = $(am__objects_12) $
 	$(am__objects_14) $(am__objects_16) $(am__objects_18) \
 	$(am__objects_3) $(am__objects_4)
 rpl_OBJECTS = $(nodist_rpl_OBJECTS)
-rpl_DEPENDENCIES = $(top_builddir)/ptmalloc3/libptmalloc3.a \
-	$(top_builddir)/lapack/lapack/liblapack.a \
+rpl_DEPENDENCIES = $(top_builddir)/lapack/lapack/liblapack.a \
 	$(top_builddir)/lapack/blas/libblas.a $(ldadd_libhistory) \
 	$(ldadd_libreadline) $(ldadd_libncurses) $(ldadd_libiconv) \
 	$(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
@@ -483,6 +482,7 @@ LIBS = @LIBS@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MALLOC = @MALLOC@
 MKDIR_P = @MKDIR_P@
 MOTIF_SUPPORT = @MOTIF_SUPPORT@
 MYSQL_SUPPORT = @MYSQL_SUPPORT@
@@ -603,14 +603,14 @@ ldadd_libssl = $(top_builddir)/tools/@OP
 include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
-date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
+date = -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\"" \
 		-Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
-hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
+hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
 		-Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
@@ -834,7 +834,7 @@ nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $
 		$(SRCXPM) $(SRCINCc)
 
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
-rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
+rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
@@ -842,7 +842,7 @@ rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
 		 $(SRCXPM) $(SRCINCc)
 
-librpl_a_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
+librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
 		-Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
@@ -855,7 +855,7 @@ INCLUDES = -I$(srcdir) -I$(top_builddir)
 		$(include_libiconv) $(include_libcrypto) $(include_libsqlite)\
 		@includeX@ @libMySQLinc@ @libPgSQLinc@
 
-rpl_LDADD = $(top_builddir)/ptmalloc3/libptmalloc3.a \
+rpl_LDADD = @MALLOC@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
@@ -5720,6 +5720,11 @@ uninstall-am: uninstall-binPROGRAMS unin
 
 
 %.conv.c: %.c
+	while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			-a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
+			do sleep 1; done
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
@@ -5727,6 +5732,11 @@ uninstall-am: uninstall-binPROGRAMS unin
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.h: %.h
+	while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			-a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
+			do sleep 1; done
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
@@ -5734,6 +5744,11 @@ uninstall-am: uninstall-binPROGRAMS unin
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.f: %.f
+	while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			-a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
+			do sleep 1; done
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
@@ -5741,6 +5756,11 @@ uninstall-am: uninstall-binPROGRAMS unin
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.F90: %.F90
+	while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			-a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
+			do sleep 1; done
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
@@ -5748,6 +5768,11 @@ uninstall-am: uninstall-binPROGRAMS unin
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %.conv.inc: %.inc
+	while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			-a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+			-a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
+			do sleep 1; done
 	$(top_builddir)/rpliconv/rpliconv \
 			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
 			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
@@ -5829,13 +5854,12 @@ generateurs.c: generateurs_aleatoires.aw
 			$(top_builddir)/src/generateurs.c
 
 rpl.inc:
-	echo BUILDPATH=$(shell pwd)/.. > $@
+	echo BUILDPATH=$(top_builddir)/.. > $@
 	echo COMPILE=$(DEFS) >> $@
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
 	echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
 			librpl.conv.o >> $@
-	echo EXTOBJECTS= \
-		$(top_builddir)/ptmalloc3/libptmalloc3.a \
+	echo EXTOBJECTS= @MALLOC@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -5847,8 +5871,6 @@ rpl.inc:
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
 		>> $@
-	gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \
-			-c -o rpl-librpl.conv.o
 
 always: $(top_builddir)/src/rpl.conv.c
 	touch $(top_builddir)/src/rpl.conv.c; \
@@ -5867,7 +5889,7 @@ librpl: install-libLIBRARIES
 	if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
 	\rm -rf $(top_builddir)/librpl/*
 	for i in $(top_builddir)/src/librpl.a \
-			$(top_builddir)/ptmalloc3/libptmalloc3.a \
+			@MALLOC@ \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \