Diff for /rpl/src/Makefile.am between versions 1.84 and 1.85

version 1.84, 2013/03/21 12:08:44 version 1.85, 2013/03/21 14:13:55
Line 25  include_libsqlite = -I$(top_srcdir)/tool Line 25  include_libsqlite = -I$(top_srcdir)/tool
 ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a  ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a
 include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src  include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
   
   ldadd_libz = $(top_builddir)/tools/@ZLIB@/libz.a
   include_libz = -I$(top_builddir)/tools/@ZLIB@
   
 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
Line 117  SRCC=\ Line 120  SRCC=\
     instructions_c6.c\      instructions_c6.c\
     instructions_c7.c\      instructions_c7.c\
     instructions_c8.c\      instructions_c8.c\
       instructions_c9.c\
     instructions_d1.c\      instructions_d1.c\
     instructions_d2.c\      instructions_d2.c\
     instructions_d3.c\      instructions_d3.c\
Line 189  SRCC=\ Line 193  SRCC=\
     instructions_t2.c\      instructions_t2.c\
     instructions_t3.c\      instructions_t3.c\
     instructions_u1.c\      instructions_u1.c\
       instructions_u2.c\
     instructions_v1.c\      instructions_v1.c\
     instructions_v2.c\      instructions_v2.c\
     instructions_w1.c\      instructions_w1.c\
Line 255  INIT_EXE=init.c Line 260  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 LIB=@ZLIB@ @MALLOC@  LIB=@MALLOC@
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
Line 416  rpl.inc: Line 421  rpl.inc:
         $(ldadd_librplcas) \          $(ldadd_librplcas) \
         $(ldadd_libsigsegv) \          $(ldadd_libsigsegv) \
         $(ldadd_libmotif) \          $(ldadd_libmotif) \
           $(ldadd_libz) \
         >> $@          >> $@
   
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
Line 433  nodist_rpl_SOURCES = \ Line 439  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@ @ELF@ @WHOLE_LIB1@ \  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \
         $(ldadd_libmotif) $(LD_MOTIF_LIBS) \          $(ldadd_libmotif) $(ldadd_libz) $(LD_MOTIF_LIBS) \
         $(LD_MOTIF_X_XMU) @WHOLE_LIB2@          $(LD_MOTIF_X_XMU) @WHOLE_LIB2@
 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@ \
Line 457  INCLUDES = -I$(srcdir) -I$(top_builddir) Line 463  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_libsigsegv) \          $(include_librplcas) $(include_libsigsegv) \
         $(include_libmotif) \          $(include_libmotif) $(include_libz) \
         @SYSROOT@ @includeX@ @libMySQLinc@ @libPgSQLinc@          @SYSROOT@ @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@ \

Removed from v.1.84  
changed lines
  Added in v.1.85


CVSweb interface <joel.bertrand@systella.fr>