--- rpl/src/Makefile.am	2010/05/24 20:07:11	1.25
+++ rpl/src/Makefile.am	2010/07/31 10:34:17	1.28
@@ -227,7 +227,9 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz
+# @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
+# utilise un allocateur différent.
+LIB=-lz @MALLOC@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -241,11 +243,6 @@ INIT_LIBc=$(INIT_LIB:.c=.conv.c)
 INIT_EXEc=$(INIT_EXE:.c=.conv.c)
 
 %.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 $< | \
@@ -253,11 +250,6 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c)
 			-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 $< | \
@@ -265,11 +257,6 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c)
 			-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 $< | \
@@ -277,11 +264,6 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c)
 			-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 $< | \
@@ -289,11 +271,6 @@ INIT_EXEc=$(INIT_EXE:.c=.conv.c)
 			-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 $< | \
@@ -380,7 +357,7 @@ rpl.inc:
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
 	echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
 			librpl.conv.o >> $@
-	echo EXTOBJECTS= @MALLOC@ \
+	echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -404,7 +381,8 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 		$(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
 		rpl.inc rpl-librpl.conv.o
 
-nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
+nodist_rpl_SOURCES = \
+		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
@@ -412,8 +390,9 @@ rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wa
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
-nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
-		 $(SRCXPM) $(SRCINCc)
+nodist_librpl_a_SOURCES = \
+		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
+		$(SRCXPM) $(SRCINCc)
 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
@@ -434,7 +413,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
-rpl_LDADD = @MALLOC@ \
+rpl_LDADD = \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \