--- rpl/src/Makefile.am 2010/05/24 20:37:27 1.26 +++ rpl/src/Makefile.am 2010/07/14 14:19:32 1.27 @@ -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 @@ -379,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 \ @@ -387,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 @@ -409,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) \