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

Diff for /rpl/src/Makefile.am between versions 1.52 and 1.53

version 1.52, 2011/06/23 13:41:16 version 1.53, 2011/06/24 09:10:37
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_libgiac = $(top_builddir)/rplcas/lib/libgiac.a  ldadd_librplcas = $(top_builddir)/rplcas/lib/librplcas.a
 include_libgiac = -I$(top_builddir)/rplcas/include/giac  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); \
Line 427  include_HEADERS = rplexternals.h rpltype Line 428  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_libgiac) \          $(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 437  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 438  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@ @BSH_PATH@          -D@OS@ @BSH_PATH@
 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) $(ldadd_libgiac) @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 469  librpl: install-libLIBRARIES Line 470  librpl: install-libLIBRARIES
             $(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_libgiac); \              $(ldadd_librplcas); \
     do \      do \
         cp -f $$i $(top_builddir)/librpl; \          cp -f $$i $(top_builddir)/librpl; \
     done      done
Removed from v.1.52  
changed lines
  Added in v.1.53

CVSweb interface <joel.bertrand@systella.fr>