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

Diff for /rpl/src/Makefile.am between versions 1.9 and 1.10

version 1.9, 2010/03/07 17:03:29 version 1.10, 2010/03/17 14:14:36
Line 14  ldadd_libiconv = $(top_builddir)/tools/@ Line 14  ldadd_libiconv = $(top_builddir)/tools/@
 include_libiconv = -I$(top_builddir)/tools/@ICONV@/include  include_libiconv = -I$(top_builddir)/tools/@ICONV@/include
   
 ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a  ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a
   ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/libssl.a
 include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include  include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include
   
 ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a  ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
 include_libsqlite = -I$(top_builddir)/tools/@SQLITE@/include  include_libsqlite = -I$(top_builddir)/tools/@SQLITE@
   
 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 341  licences: Line 342  licences:
 librplprototypes.h: rpl.h conversion.awk  librplprototypes.h: rpl.h conversion.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
     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
   
   rpl.inc:
       echo BUILDPATH=$(shell pwd)/.. > $@
       echo COMPILE=$(DEFS) >> $@
       echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
       echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
               librpl.conv.o >> $@
       echo EXTOBJECTS= \
           addlib $(top_builddir)/lapack/lapack/liblapack.a+ \
           addlib $(top_builddir)/lapack/blas/libblas.a+ \
           addlib $(ldadd_libhistory)+ \
           addlib $(ldadd_libreadline)+ \
           addlib $(ldadd_libncurses)+ \
           addlib $(ldadd_libgsl)+ \
           addlib $(ldadd_libiconv)+ \
           addlib $(ldadd_libcrypto)+ \
           addlib $(ldadd_libssl)+ \
           addlib $(ldadd_libsqlite) \
           >> $@
       gcc $(INCLUDES) $(DEFS) $(AM_CFLAGS) $(rpl_CFLAGS) librpl.conv.c \
               -c -o rpl-librpl.conv.o
   
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCF) $(SRCF90) $(SRCINC) \
         $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \          $(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
         conversion.awk generateurs_aleatoires.awk          conversion.awk generateurs_aleatoires.awk
 BUILT_SOURCES = librplprototypes.h generateurs.c \  BUILT_SOURCES = librplprototypes.h generateurs.c \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) \
         $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc)          $(INIT_LIBc) $(SRCINCc) $(INIT_EXEc) \
           rpl.inc
 CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
         $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h          $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
           rpl.inc rpl-librpl.conv.o
   
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \  nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 #rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic  #rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -export-dynamic  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) --export-dynamic
   
 rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \  rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
              -Wno-pointer-sign -Wno-unused-parameter               -Wno-pointer-sign -Wno-unused-parameter
Line 372  librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL Line 397  librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c  librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore  librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
   
 include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h  include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h rpl.inc
   
 INCLUDES = -I$(srcdir) -I$(top_builddir) \  INCLUDES = -I$(srcdir) -I$(top_builddir) \
         $(include_libreadline) $(include_libncurses) $(include_libgsl) \          $(include_libreadline) $(include_libncurses) $(include_libgsl) \
Line 388  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 413  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_libcrypto) $(ldadd_libsqlite) \          $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
           $(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 396  always: $(top_builddir)/src/rpl.conv.c Line 422  always: $(top_builddir)/src/rpl.conv.c
     (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCH) $(SRCINC) \      (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCH) $(SRCINC) \
             $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null);              $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null);
   
 .PHONY: always librpl licences  .PHONY: always librpl licences rpl.inc
   
 all-local: always  all-local: always
   
Line 413  librpl: install-libLIBRARIES Line 439  librpl: install-libLIBRARIES
         addlib $(ldadd_libgsl)+ \          addlib $(ldadd_libgsl)+ \
         addlib $(ldadd_libiconv)+ \          addlib $(ldadd_libiconv)+ \
         addlib $(ldadd_libcrypto)+ \          addlib $(ldadd_libcrypto)+ \
           addlib $(ldadd_libssl)+ \
         addlib $(ldadd_libsqlite)+ \          addlib $(ldadd_libsqlite)+ \
         save+ \          save+ \
         end \          end \
Removed from v.1.9  
changed lines
  Added in v.1.10

CVSweb interface <joel.bertrand@systella.fr>