--- rpl/src/Makefile.am	2010/09/02 07:51:47	1.39
+++ rpl/src/Makefile.am	2010/12/21 13:47:19	1.47
@@ -40,6 +40,10 @@ hash = -Drplpp_md5="\"$(shell $(top_buil
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
 		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
+		-Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
+		-Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
 		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
 		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
@@ -231,8 +235,6 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-# @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
-# utilise un allocateur différent.
 LIB=-lz @MALLOC@
 
 bin_PROGRAMS = rpl
@@ -357,12 +359,13 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE=$(DEFS) >> $@
+	echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \
+		sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
 	echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
 	echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
-	echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
+	echo EXTOBJECTS= @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -414,10 +417,10 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
-		@SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
+		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
-		-D@OS@
+		-D@OS@ @BSH_PATH@
 rpl_LDADD = \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
@@ -427,7 +430,7 @@ rpl_LDADD = \
 		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
-	touch $(top_builddir)/src/rpl.conv.c; \
+	touch $<; \
 	if [ x$(shell which ctags) != x ]; then \
    		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
 				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
@@ -445,7 +448,6 @@ librpl: install-libLIBRARIES
 	fi
 	mkdir -p $(top_builddir)/librpl; \
 	for i in $(top_builddir)/src/librpl.a \
-			@MALLOC@ \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \