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

Diff for /rpl/src/Makefile.am between versions 1.56 and 1.62

version 1.56, 2011/07/24 17:11:18 version 1.62, 2011/09/16 14:42:03
Line 1 Line 1
   include $(top_builddir)/tools/openmotif.lib
   
 ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a  ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a
 include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \  include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
         -I$(top_srcdir)/tools/@NCURSES@/include          -I$(top_srcdir)/tools/@NCURSES@/include
Line 20  include_libcrypto = -I$(top_builddir)/to Line 22  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_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/libsigsegv.a
   include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
   
 ldadd_librplcas = @LIBRPLCAS@  ldadd_librplcas = @LIBRPLCAS@
 include_librplcas = -I$(top_builddir)/rplcas/include/giac \  include_librplcas = -I$(top_builddir)/rplcas/include/giac \
         -I$(top_builddir)/rplcas/include          -I$(top_builddir)/rplcas/include
   
   ldadd_libmotif = @LIBMOTIF@
   include_libmotif = @INCMOTIF@
   
 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 139  SRCC=\ Line 147  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 172  SRCC=\ Line 181  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 196  SRCC=\ Line 206  SRCC=\
     rplcore.c\      rplcore.c\
     semaphores.c\      semaphores.c\
     sequenceur.c\      sequenceur.c\
     siginfo.c\  
     simplification.c\      simplification.c\
     sommations.c\      sommations.c\
     sql.c\      sql.c\
Line 393  rpl.inc: Line 402  rpl.inc:
         $(ldadd_libssl) \          $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) \
         $(ldadd_librplcas) \          $(ldadd_librplcas) \
           $(ldadd_libsigsegv) \
           $(ldadd_libmotif) \
         >> $@          >> $@
   
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
Line 409  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc) Line 420  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc)
 nodist_rpl_SOURCES = \  nodist_rpl_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCCPPc) $(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@ @ELF@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \  rpl_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@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
Line 429  include_HEADERS = rplexternals.h rpltype Line 440  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) \          $(include_librplcas) $(include_libsigsegv) \
           $(include_libmotif) \
         @includeX@ @libMySQLinc@ @libPgSQLinc@          @includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
         -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@ \
Line 444  rpl_LDADD = -lgfortran \ Line 456  rpl_LDADD = -lgfortran \
         $(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_libsigsegv) \
           $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
         $(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@          $(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
   
 always: $(top_builddir)/src/rpl-conv.c  always: $(top_builddir)/src/rpl-conv.c
Line 471  librpl: install-libLIBRARIES Line 484  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_librplcas); \              $(ldadd_librplcas) $(ldadd_libsigsegv) $(ldadd_libmotif); \
     do \      do \
         cp -f $$i $(top_builddir)/librpl; \          cp -f $$i $(top_builddir)/librpl; \
     done      done
Removed from v.1.56  
changed lines
  Added in v.1.62

CVSweb interface <joel.bertrand@systella.fr>