--- rpl/src/Attic/Makefile.in 2010/05/10 08:30:32 1.25 +++ rpl/src/Attic/Makefile.in 2010/07/31 10:34:17 1.37 @@ -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) \ @@ -454,6 +453,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ EXPERIMENTAL_CODE = @EXPERIMENTAL_CODE@ EXPORT_DYNAMIC = @EXPORT_DYNAMIC@ +EXT_SQL = @EXT_SQL@ F77 = @F77@ FC = @FC@ FCFLAGS = @FCFLAGS@ @@ -483,6 +483,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 +604,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))\"" \ @@ -808,7 +809,10 @@ SRCXPM = \ 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@ lib_LIBRARIES = librpl.a SRCCc = $(SRCC:.c=.conv.c) SRCHc = $(SRCH:.h=.conv.h) @@ -830,17 +834,19 @@ 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 \ - -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@ -Wno_inline + -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) +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@ @@ -855,7 +861,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 = \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ @@ -5829,13 +5835,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@ @EXT_SQL@ \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) \ @@ -5865,7 +5870,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 \