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

Diff for /rpl/src/Makefile.am between versions 1.51 and 1.57

version 1.51, 2011/06/23 13:03:39 version 1.57, 2011/08/03 09:26:46
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 135  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 371  generateurs.c: generateurs_aleatoires.aw Line 376  generateurs.c: generateurs_aleatoires.aw
   
 rpl.inc:  rpl.inc:
     echo BUILDPATH=$(top_builddir)/.. > $@      echo BUILDPATH=$(top_builddir)/.. > $@
     echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \      echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \
         sed -e '1,$$s/=\\"/="\\"/g' | 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)) \
Line 388  rpl.inc: Line 393  rpl.inc:
         $(ldadd_libcrypto) \          $(ldadd_libcrypto) \
         $(ldadd_libssl) \          $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) \
           $(ldadd_librplcas) \
         >> $@          >> $@
   
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
Line 423  include_HEADERS = rplexternals.h rpltype Line 429  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@ \
Line 432  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 439  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         @SEMAPHORES_NOMMES@ @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@ @BSH_PATH@          -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 $<; \      touch $<; \
Line 464  librpl: install-libLIBRARIES Line 471  librpl: install-libLIBRARIES
             $(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.51  
changed lines
  Added in v.1.57

CVSweb interface <joel.bertrand@systella.fr>