[BACK]Return to Makefile.am CVS log [TXT] [DIR] Up to [local] / rpl / src

Diff for /rpl/src/Makefile.am between versions 1.18 and 1.30

version 1.18, 2010/04/27 15:53:36 version 1.30, 2010/08/06 15:32:56
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.h:
       $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
               $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) > $@
   
   hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(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$(EXEEXT) \
         $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
         -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \          -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \          $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
         -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \          $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
         -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \          -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \          -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \          $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
         -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""          $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
   
 SRCC=\  SRCC=\
Line 83  SRCC=\ Line 87  SRCC=\
     gestion_variables.c\      gestion_variables.c\
     gestion_variables_statiques.c\      gestion_variables_statiques.c\
     gestion_variables_partagees.c\      gestion_variables_partagees.c\
       getaddrinfo.c\
     indicateurs.c\      indicateurs.c\
     instructions_a1.c\      instructions_a1.c\
     instructions_a2.c\      instructions_a2.c\
Line 132  SRCC=\ Line 137  SRCC=\
     instructions_m2.c\      instructions_m2.c\
     instructions_m3.c\      instructions_m3.c\
     instructions_m4.c\      instructions_m4.c\
       instructions_m5.c\
     instructions_n1.c\      instructions_n1.c\
     instructions_n2.c\      instructions_n2.c\
     instructions_o1.c\      instructions_o1.c\
Line 196  SRCH=\ Line 202  SRCH=\
     convert.h\      convert.h\
     copyright.h\      copyright.h\
     garanties.h\      garanties.h\
       getaddrinfo.h\
     gnuplot.h\      gnuplot.h\
     librpl.h\      librpl.h\
     licence.h\      licence.h\
Line 226  INIT_EXE=init.c Line 233  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 LIB=-lz @LIBMTMALLOC@  # @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
   
 SRCCc=$(SRCC:.c=.conv.c)  SRCCc=$(SRCC:.c=-conv.c)
 SRCHc=$(SRCH:.h=.conv.h)  SRCHc=$(SRCH:.h=-conv.h)
 SRCFc=$(SRCF:.f=.conv.f)  SRCFc=$(SRCF:.f=-conv.f)
 SRCF90c=$(SRCF90:.F90=.conv.F90)  SRCF90c=$(SRCF90:.F90=-conv.F90)
 SRCINCc=$(SRCINC:.inc=.conv.inc)  SRCINCc=$(SRCINC:.inc=-conv.inc)
 INIT_LIBc=$(INIT_LIB:.c=.conv.c)  INIT_LIBc=$(INIT_LIB:.c=-conv.c)
 INIT_EXEc=$(INIT_EXE:.c=.conv.c)  INIT_EXEc=$(INIT_EXE:.c=-conv.c)
   
 %.conv.c: %.c  %-conv.c: %.c
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.h: %.h  %-conv.h: %.h
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.f: %.f  %-conv.f: %.f
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.F90: %.F90  %-conv.F90: %.F90
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.inc: %.inc  %-conv.inc: %.inc
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 349  generateurs.c: generateurs_aleatoires.aw Line 358  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=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
             librpl.conv.o >> $@              $(SRCF90c:.F90=.$(OBJEXT)) \
     echo EXTOBJECTS= \              librpl-conv.$(OBJEXT) >> $@
       echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
         $(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 366  rpl.inc: Line 376  rpl.inc:
         $(ldadd_libssl) \          $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(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) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \
         $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \          $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
Line 378  BUILT_SOURCES = librplprototypes.h gener Line 386  BUILT_SOURCES = librplprototypes.h gener
         rpl.inc          rpl.inc
 CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
         $(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.$(OBJEXT)
   
 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) @EXPORT_DYNAMIC@
   rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
 rpl_CFLAGS = $(AM_CFLAGS) -ULIBRPL -Wall -Wextra \  
          -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@           -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 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) \
 librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL -Wall -Wextra \          $(SRCXPM) $(SRCINCc)
   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
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore  librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
Line 411  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 420  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)/lapack/lapack/liblapack.a \  rpl_LDADD = \
           $(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) \
         $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \          $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) \
         $(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@          $(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
   
 always: $(top_builddir)/src/rpl.conv.c  always: $(top_builddir)/src/rpl-conv.c
     touch $(top_builddir)/src/rpl.conv.c; \      touch $(top_builddir)/src/rpl.conv.c; \
     if [ x$(shell which ctags) != x ]; then \      if [ x$(shell which ctags) != x ]; then \
         (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \          (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
Line 435  librpl: install-libLIBRARIES Line 445  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 \
               @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.18  
changed lines
  Added in v.1.30

CVSweb interface <joel.bertrand@systella.fr>