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

Diff for /rpl/src/Makefile.am between versions 1.39 and 1.58

version 1.39, 2010/09/02 07:51:47 version 1.58, 2011/08/29 07:43:01
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@
   
   ldadd_librplcas = @LIBRPLCAS@
   include_librplcas = -I$(top_builddir)/rplcas/include/giac \
           -I$(top_builddir)/rplcas/include
   
 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);}')\"" \
Line 40  hash = -Drplpp_md5="\"$(shell $(top_buil Line 44  hash = -Drplpp_md5="\"$(shell $(top_buil
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \          -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
           -Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
           $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
           -Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
           $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
         -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \          -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$(EXEEXT) \          -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
Line 70  SRCC=\ Line 78  SRCC=\
     fonctions_trigonometriques.c\      fonctions_trigonometriques.c\
     formateur.c\      formateur.c\
     formateur_fichiers.c\      formateur_fichiers.c\
       formateur_flux.c\
     fusible.c\      fusible.c\
     generateurs_aleatoires.c\      generateurs_aleatoires.c\
     gestion_fichiers.c\      gestion_fichiers.c\
Line 130  SRCC=\ Line 139  SRCC=\
     instructions_l3.c\      instructions_l3.c\
     instructions_l4.c\      instructions_l4.c\
     instructions_l5.c\      instructions_l5.c\
       instructions_l6.c\
     instructions_m1.c\      instructions_m1.c\
     instructions_m2.c\      instructions_m2.c\
     instructions_m3.c\      instructions_m3.c\
Line 163  SRCC=\ Line 173  SRCC=\
     instructions_s8.c\      instructions_s8.c\
     instructions_s9.c\      instructions_s9.c\
     instructions_s10.c\      instructions_s10.c\
       instructions_s11.c\
     instructions_t1.c\      instructions_t1.c\
     instructions_t2.c\      instructions_t2.c\
     instructions_t3.c\      instructions_t3.c\
Line 195  SRCC=\ Line 206  SRCC=\
     transliteration.c\      transliteration.c\
     types.c      types.c
   
   SRCCPP=\
       interface_cas.cpp
   
 SRCH=\  SRCH=\
     completion.h\      completion.h\
     convert.h\      convert.h\
Line 231  INIT_EXE=init.c Line 245  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 # @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran  
 # utilise un allocateur différent.  
 LIB=-lz @MALLOC@  LIB=-lz @MALLOC@
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
Line 240  lib_LIBRARIES = librpl.a Line 252  lib_LIBRARIES = librpl.a
   
 SRCCc=$(SRCC:.c=-conv.c)  SRCCc=$(SRCC:.c=-conv.c)
 SRCHc=$(SRCH:.h=-conv.h)  SRCHc=$(SRCH:.h=-conv.h)
   SRCCPPc=$(SRCCPP:.cpp=-conv.cpp)
 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)
Line 253  INIT_EXEc=$(INIT_EXE:.c=-conv.c) Line 266  INIT_EXEc=$(INIT_EXE:.c=-conv.c)
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
   %-conv.cpp: %.cpp
       $(top_builddir)/rpliconv/rpliconv \
               -f `$(top_builddir)/tools/@FILE@/src/rplfile \
               -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
               $(AWK) -F= '{print $$2;}'` \
               -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 \
Line 300  licences: Line 320  licences:
     echo "#endif" >> $(srcdir)/licence.h      echo "#endif" >> $(srcdir)/licence.h
     echo >> $(srcdir)/licence.h      echo >> $(srcdir)/licence.h
     echo "// vim: ts=4" >> $(srcdir)/licence.h      echo "// vim: ts=4" >> $(srcdir)/licence.h
     for i in $(SRCC) $(SRCH) $(INIT_EXE) $(INIT_LIB); \      for i in $(SRCC) $(SRCCPP) $(SRCH) $(INIT_EXE) $(INIT_LIB); \
     do \      do \
         cat $(srcdir)/../COPYING > $(srcdir)/tmp; \          cat $(srcdir)/../COPYING > $(srcdir)/tmp; \
         echo >> $(srcdir)/tmp; \          echo >> $(srcdir)/tmp; \
Line 357  generateurs.c: generateurs_aleatoires.aw Line 377  generateurs.c: generateurs_aleatoires.aw
   
 rpl.inc:  rpl.inc:
     echo BUILDPATH=$(top_builddir)/.. > $@      echo BUILDPATH=$(top_builddir)/.. > $@
     echo COMPILE=$(DEFS) >> $@      echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \
           sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
     echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@      echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
     echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \      echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
             $(SRCF90c:.F90=.$(OBJEXT)) \              $(SRCF90c:.F90=.$(OBJEXT)) \
             librpl-conv.$(OBJEXT) >> $@              librpl-conv.$(OBJEXT) >> $@
     echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \      echo EXTOBJECTS= @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 373  rpl.inc: Line 394  rpl.inc:
         $(ldadd_libcrypto) \          $(ldadd_libcrypto) \
         $(ldadd_libssl) \          $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) \
           $(ldadd_librplcas) \
         >> $@          >> $@
   
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
         $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \          $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
         conversion.awk generateurs_aleatoires.awk          conversion.awk generateurs_aleatoires.awk
 BUILT_SOURCES = librplprototypes.h generateurs.c \  BUILT_SOURCES = librplprototypes.h generateurs.c \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \          $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) \
         $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \          $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \
         rpl.inc          rpl.inc
 CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
         $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \          $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
         rpl.inc rpl-librpl-conv.$(OBJEXT)          rpl.inc rpl-librpl-conv.$(OBJEXT)
   
 nodist_rpl_SOURCES = \  nodist_rpl_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \          $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \  rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
Line 396  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c Line 418  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 = \  nodist_librpl_a_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCCPPc) $(SRCF90c) $(INIT_LIBc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \  librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
         -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@          -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
Line 408  include_HEADERS = rplexternals.h rpltype Line 430  include_HEADERS = rplexternals.h rpltype
   
 INCLUDES = -I$(srcdir) -I$(top_builddir) \  INCLUDES = -I$(srcdir) -I$(top_builddir) \
         $(include_libreadline) $(include_libncurses) $(include_libgsl) \          $(include_libreadline) $(include_libncurses) $(include_libgsl) \
         $(include_libiconv) $(include_libcrypto) $(include_libsqlite)\          $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
           $(include_librplcas) \
         @includeX@ @libMySQLinc@ @libPgSQLinc@          @includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \
         -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \          -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
         @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \          @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
         @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \          @VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
         @SEMAPHORES_NOMMES@ @SEMAPHORES_SYSV@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \          @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
         @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"@FINAL_ENCODING@\" \          -Dd_locale=\"@FINAL_ENCODING@\" \
         -D@OS@          -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"
 rpl_LDADD = \  rpl_LDADD = -lgfortran \
         $(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) \
         $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \          $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) \
         $(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@          $(ldadd_libgsl) $(ldadd_librplcas) @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 $<; \
     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) \
                 $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \                  $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
Line 445  librpl: install-libLIBRARIES Line 468  librpl: install-libLIBRARIES
     fi      fi
     mkdir -p $(top_builddir)/librpl; \      mkdir -p $(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 \
             $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \              $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
             $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \              $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
               $(ldadd_librplcas); \
     do \      do \
         cp -f $$i $(top_builddir)/librpl; \          cp -f $$i $(top_builddir)/librpl; \
     done      done
Removed from v.1.39  
changed lines
  Added in v.1.58

CVSweb interface <joel.bertrand@systella.fr>