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

Diff for /rpl/src/Makefile.am between versions 1.5 and 1.6

version 1.5, 2010/03/04 10:09:31 version 1.6, 2010/03/04 17:42:46
Line 10  include_libreadline = -I$(top_srcdir)/to Line 10  include_libreadline = -I$(top_srcdir)/to
 ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a  ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@  include_libgsl = -I$(top_builddir)/tools/@GSL@
   
 ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@  ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 include_libiconv = -I$(top_builddir)/tools/@ICONV@/include  include_libiconv = -I$(top_builddir)/tools/@ICONV@/include
   
   ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a
   include_libcrypto = -I$(top_builddir)/tools/@ICONV@/include
   
   ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
   include_libsqlite = -I$(top_builddir)/tools/@SQLITE@/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 35  SRCC=\ Line 41  SRCC=\
     chainage.c\      chainage.c\
     compilation.c\      compilation.c\
     completion.c\      completion.c\
       controle.c \
     daemon.c\      daemon.c\
     date.c\      date.c\
     depassements.c\      depassements.c\
Line 351  include_HEADERS = rplexternals.h rpltype Line 358  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_libiconv) $(include_libcrypto) $(include_libsqlite)\
         @includeX@ @libMySQLinc@ @libPgSQLinc@          @includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
         -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \          -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
Line 363  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 370  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 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_libiconv) $(ldadd_libcrypto) $(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
Line 387  librpl: install-libLIBRARIES Line 394  librpl: install-libLIBRARIES
         addlib $(ldadd_libncurses)+ \          addlib $(ldadd_libncurses)+ \
         addlib $(ldadd_libgsl)+ \          addlib $(ldadd_libgsl)+ \
         addlib $(ldadd_libiconv)+ \          addlib $(ldadd_libiconv)+ \
           addlib $(ldadd_libcrypto)+ \
           addlib $(ldadd_libsqlite)+ \
         save+ \          save+ \
         end \          end \
     | tr '+' '\n' | ar -M; \      | tr '+' '\n' | ar -M; \
Removed from v.1.5  
changed lines
  Added in v.1.6

CVSweb interface <joel.bertrand@systella.fr>