Diff for /rpl/src/Makefile.am between versions 1.70 and 1.75

version 1.70, 2011/11/15 07:01:37 version 1.75, 2012/04/08 18:03:09
Line 163  SRCC=\ Line 163  SRCC=\
     instructions_p5.c\      instructions_p5.c\
     instructions_p6.c\      instructions_p6.c\
     instructions_p7.c\      instructions_p7.c\
       instructions_p8.c\
     instructions_q1.c\      instructions_q1.c\
     instructions_r1.c\      instructions_r1.c\
     instructions_r2.c\      instructions_r2.c\
Line 170  SRCC=\ Line 171  SRCC=\
     instructions_r4.c\      instructions_r4.c\
     instructions_r5.c\      instructions_r5.c\
     instructions_r6.c\      instructions_r6.c\
       instructions_r7.c\
     instructions_s1.c\      instructions_s1.c\
     instructions_s2.c\      instructions_s2.c\
     instructions_s3.c\      instructions_s3.c\
Line 251  INIT_EXE=init.c Line 253  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 LIB=-lz @MALLOC@  LIB=@ZLIB@ @MALLOC@
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
Line 379  licences: Line 381  licences:
     done      done
   
 librplprototypes.h: rpl.h conversion.awk  librplprototypes.h: rpl.h conversion.awk
     @echo "  AWK $@"      @echo "  AWK    $@"
     @$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \      @$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \
             $(top_builddir)/src/librplprototypes.h              $(top_builddir)/src/librplprototypes.h
   
 generateurs.c: generateurs_aleatoires.awk  generateurs.c: generateurs_aleatoires.awk
     @echo "  AWK $@"      @echo "  AWK    $@"
     @$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \      @$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \
             $(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \              $(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \
             $(top_builddir)/src/generateurs.c              $(top_builddir)/src/generateurs.c
Line 394  rpl.inc: Line 396  rpl.inc:
     @echo BUILDPATH=$(top_builddir)/.. > $@      @echo BUILDPATH=$(top_builddir)/.. > $@
     @echo COMPILE="$(DEFS) @ABI@" | 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@ @ZLIB@ >> $@
     @echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \      @echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
             $(SRCF90c:.F90=.$(OBJEXT)) \              $(SRCF90c:.F90=.$(OBJEXT)) \
             librpl-conv.$(OBJEXT) >> $@              librpl-conv.$(OBJEXT) >> $@
Line 452  INCLUDES = -I$(srcdir) -I$(top_builddir) Line 454  INCLUDES = -I$(srcdir) -I$(top_builddir)
         $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \          $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
         $(include_librplcas) $(include_libsigsegv) \          $(include_librplcas) $(include_libsigsegv) \
         $(include_libmotif) \          $(include_libmotif) \
         @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@ \
         @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \          @MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \

Removed from v.1.70  
changed lines
  Added in v.1.75


CVSweb interface <joel.bertrand@systella.fr>