--- rpl/src/Attic/Makefile.in 2010/05/09 15:43:15 1.24 +++ rpl/src/Attic/Makefile.in 2010/05/19 09:23:58 1.28 @@ -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) \ @@ -483,6 +482,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@ @@ -834,7 +834,7 @@ nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $ $(SRCXPM) $(SRCINCc) rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@ -rpl_CFLAGS = $(AM_CFLAGS) -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 @@ -842,7 +842,7 @@ rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second- nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \ $(SRCXPM) $(SRCINCc) -librpl_a_CFLAGS = $(AM_CFLAGS) -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 @@ -855,7 +855,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 = @MALLOC@ \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ @@ -5834,8 +5834,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= \ - $(top_builddir)/ptmalloc3/libptmalloc3.a \ + echo EXTOBJECTS= @MALLOC@ \ $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libhistory) \ @@ -5847,8 +5846,6 @@ rpl.inc: $(ldadd_libssl) \ $(ldadd_libsqlite) \ >> $@ - gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \ - -c -o rpl-librpl.conv.o always: $(top_builddir)/src/rpl.conv.c touch $(top_builddir)/src/rpl.conv.c; \ @@ -5867,7 +5864,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 \