Diff for /rpl/src/Makefile.am between versions 1.22 and 1.27

version 1.22, 2010/05/10 08:30:31 version 1.27, 2010/07/14 14:19:32
Line 20  include_libcrypto = -I$(top_builddir)/to Line 20  include_libcrypto = -I$(top_builddir)/to
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a  ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@  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); \          $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
         printf("%s\n", v);}')\"" \          printf("%s\n", v);}')\"" \
         -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \          -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \
         $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \          $(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
         printf("%s\n", 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))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
         -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
         $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
Line 227  INIT_EXE=init.c Line 227  INIT_EXE=init.c
   
 INIT_LIB=librpl.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  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
Line 350  generateurs.c: generateurs_aleatoires.aw Line 352  generateurs.c: generateurs_aleatoires.aw
             $(top_builddir)/src/generateurs.c              $(top_builddir)/src/generateurs.c
   
 rpl.inc:  rpl.inc:
     echo BUILDPATH=$(shell pwd)/.. > $@      echo BUILDPATH=$(top_builddir)/.. > $@
     echo COMPILE=$(DEFS) >> $@      echo COMPILE=$(DEFS) >> $@
     echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@      echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
     echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \      echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
             librpl.conv.o >> $@              librpl.conv.o >> $@
     echo EXTOBJECTS= \      echo EXTOBJECTS= @MALLOC@ \
         $(top_builddir)/ptmalloc3/libptmalloc3.a \  
         $(top_builddir)/lapack/lapack/liblapack.a \          $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
         $(ldadd_libhistory) \          $(ldadd_libhistory) \
Line 380  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $ Line 381  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
         $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \          $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
         rpl.inc rpl-librpl.conv.o          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)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
Line 388  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wa Line 390  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wa
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c  rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
   
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \  nodist_librpl_a_SOURCES = \
          $(SRCXPM) $(SRCINCc)          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
           $(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
         -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@          -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c  librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
Line 410  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 413  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"@FINAL_ENCODING@\" \          -Dd_locale=\"@FINAL_ENCODING@\" \
         -D@OS@          -D@OS@
 rpl_LDADD = $(top_builddir)/ptmalloc3/libptmalloc3.a \  rpl_LDADD = \
         $(top_builddir)/lapack/lapack/liblapack.a \          $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
         $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \          $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
Line 435  librpl: install-libLIBRARIES Line 438  librpl: install-libLIBRARIES
     if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi      if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
     \rm -rf $(top_builddir)/librpl/*      \rm -rf $(top_builddir)/librpl/*
     for i in $(top_builddir)/src/librpl.a \      for i in $(top_builddir)/src/librpl.a \
             $(top_builddir)/ptmalloc3/libptmalloc3.a \              @MALLOC@ \
             $(ldadd_libhistory) $(ldadd_libreadline) \              $(ldadd_libhistory) $(ldadd_libreadline) \
             $(top_builddir)/lapack/lapack/liblapack.a \              $(top_builddir)/lapack/lapack/liblapack.a \
             $(top_builddir)/lapack/blas/libblas.a \              $(top_builddir)/lapack/blas/libblas.a \

Removed from v.1.22  
changed lines
  Added in v.1.27


CVSweb interface <joel.bertrand@systella.fr>