--- rpl/src/Makefile.am	2010/04/27 15:53:36	1.18
+++ rpl/src/Makefile.am	2010/05/24 20:37:27	1.26
@@ -20,14 +20,14 @@ include_libcrypto = -I$(top_builddir)/to
 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))\"" \
@@ -132,6 +132,7 @@ SRCC=\
 	instructions_m2.c\
 	instructions_m3.c\
 	instructions_m4.c\
+	instructions_m5.c\
 	instructions_n1.c\
 	instructions_n2.c\
 	instructions_o1.c\
@@ -226,7 +227,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz @LIBMTMALLOC@
+LIB=-lz
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -349,12 +350,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= \
+	echo EXTOBJECTS= @MALLOC@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -366,8 +367,6 @@ rpl.inc:
 		$(ldadd_libssl) \
 		$(ldadd_libsqlite) \
 		>> $@
-	gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \
-			-c -o rpl-librpl.conv.o
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \
 		$(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
@@ -383,15 +382,14 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
-
-rpl_CFLAGS = $(AM_CFLAGS) -ULIBRPL -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
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
 		 $(SRCXPM) $(SRCINCc)
-librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL -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
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
@@ -411,7 +409,8 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
 		-D@OS@
-rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \
+rpl_LDADD = @MALLOC@ \
+		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
@@ -435,6 +434,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 \
+			@MALLOC@ \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \