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

Diff for /rpl/src/Makefile.am between versions 1.15 and 1.27

version 1.15, 2010/04/07 07:16:12 version 1.27, 2010/07/14 14:19:32
Line 20  include_libcrypto = -I$(top_builddir)/to Line 20  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@
   
 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);}')\"" \
         -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \          -Dd_date_en_rpl="\"$(shell LC_ALL=C 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);}')\""
   
 hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \  hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
         $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
         -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
         $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
Line 132  SRCC=\ Line 132  SRCC=\
     instructions_m2.c\      instructions_m2.c\
     instructions_m3.c\      instructions_m3.c\
     instructions_m4.c\      instructions_m4.c\
       instructions_m5.c\
     instructions_n1.c\      instructions_n1.c\
     instructions_n2.c\      instructions_n2.c\
     instructions_o1.c\      instructions_o1.c\
Line 182  SRCC=\ Line 183  SRCC=\
     profilage.c\      profilage.c\
     rpl.c\      rpl.c\
     rplcore.c\      rplcore.c\
       semaphores.c\
     sequenceur.c\      sequenceur.c\
     simplification.c\      simplification.c\
     sommations.c\      sommations.c\
Line 225  INIT_EXE=init.c Line 227  INIT_EXE=init.c
   
 INIT_LIB=librpl.c  INIT_LIB=librpl.c
   
 LIB=-lz @LIBMTMALLOC@  # @MALLOC@ doit être la première bibliothèque pour éviter que la libgfortran
   # utilise un allocateur différent.
   LIB=-lz @MALLOC@
   
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
Line 348  generateurs.c: generateurs_aleatoires.aw Line 352  generateurs.c: generateurs_aleatoires.aw
             $(top_builddir)/src/generateurs.c              $(top_builddir)/src/generateurs.c
   
 rpl.inc:  rpl.inc:
     echo BUILDPATH=$(shell pwd)/.. > $@      echo BUILDPATH=$(top_builddir)/.. > $@
     echo COMPILE=$(DEFS) >> $@      echo COMPILE=$(DEFS) >> $@
     echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@      echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ $(LIBS) >> $@
     echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \      echo OBJECTS=$(SRCCc:.c=.o) $(SRCFc:.f=.o) $(SRCF90c:.F90=.o) \
             librpl.conv.o >> $@              librpl.conv.o >> $@
     echo EXTOBJECTS= \      echo EXTOBJECTS= @MALLOC@ \
         addlib $(top_builddir)/lapack/lapack/liblapack.a+ \          $(top_builddir)/lapack/lapack/liblapack.a \
         addlib $(top_builddir)/lapack/blas/libblas.a+ \          $(top_builddir)/lapack/blas/libblas.a \
         addlib $(ldadd_libhistory)+ \          $(ldadd_libhistory) \
         addlib $(ldadd_libreadline)+ \          $(ldadd_libreadline) \
         addlib $(ldadd_libncurses)+ \          $(ldadd_libncurses) \
         addlib $(ldadd_libgsl)+ \          $(ldadd_libgsl) \
         addlib $(ldadd_libiconv)+ \          $(ldadd_libiconv) \
         addlib $(ldadd_libcrypto)+ \          $(ldadd_libcrypto) \
         addlib $(ldadd_libssl)+ \          $(ldadd_libssl) \
         addlib $(ldadd_libsqlite) \          $(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) \
Line 379  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $ Line 381  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
         $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \          $(INIT_LIBc) $(INIT_EXEc) librplprototypes.h generateurs.c \
         rpl.inc rpl-librpl.conv.o          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) -Wl,@EXPORT_DYNAMIC@
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,--export-dynamic  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
            -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \  
              -Wno-pointer-sign -Wno-unused-parameter  
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c  rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
   
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \  nodist_librpl_a_SOURCES = \
          $(SRCXPM) $(SRCINCc)          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
 librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL \          $(SRCXPM) $(SRCINCc)
         -Wall -Wextra -Wno-pointer-sign -Wno-unused-parameter  librpl_a_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
           -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 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 rpl.inc  include_HEADERS = rplexternals.h rpltypes.h rpl.h librpl.h rpl.inc \
           librplprototypes.h
   
 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 406  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 409  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         -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@ \
           @SEMAPHORES_NOMMES@ \
         @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"@FINAL_ENCODING@\" \          -Dd_locale=\"@FINAL_ENCODING@\" \
         -D@OS@          -D@OS@
 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_libssl) \          $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
Line 418  rpl_LDADD = $(top_builddir)/lapack/lapac Line 423  rpl_LDADD = $(top_builddir)/lapack/lapac
   
 always: $(top_builddir)/src/rpl.conv.c  always: $(top_builddir)/src/rpl.conv.c
     touch $(top_builddir)/src/rpl.conv.c; \      touch $(top_builddir)/src/rpl.conv.c; \
     (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \      if [ x$(shell which ctags) != x ]; then \
             $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null);          (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
                   $(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
       fi;
   
 .PHONY: always librpl licences rpl.inc  .PHONY: always librpl licences rpl.inc
   
Line 428  all-local: always Line 435  all-local: always
 install-exec-local: librpl  install-exec-local: librpl
   
 librpl: install-libLIBRARIES  librpl: install-libLIBRARIES
     echo \      if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
         open $(libdir)/librpl.a+ \      \rm -rf $(top_builddir)/librpl/*
         addlib $(top_builddir)/lapack/lapack/liblapack.a+ \      for i in $(top_builddir)/src/librpl.a \
         addlib $(top_builddir)/lapack/blas/libblas.a+ \              @MALLOC@ \
         addlib $(ldadd_libhistory)+ \              $(ldadd_libhistory) $(ldadd_libreadline) \
         addlib $(ldadd_libreadline)+ \              $(top_builddir)/lapack/lapack/liblapack.a \
         addlib $(ldadd_libncurses)+ \              $(top_builddir)/lapack/blas/libblas.a \
         addlib $(ldadd_libgsl)+ \              $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
         addlib $(ldadd_libiconv)+ \              $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \
         addlib $(ldadd_libcrypto)+ \      do \
         addlib $(ldadd_libssl)+ \          \cp -f $$i $(top_builddir)/librpl; \
         addlib $(ldadd_libsqlite)+ \      done
         save+ \      (cd $(top_builddir)/librpl && \
         end \              for i in *.a; do ar x $$i && \rm -f $$i; done; \
     | tr '+' '\n' | ar -M; \              ar cr librpl.a *)
     $(RANLIB) $(libdir)/librpl.a      \mv -f $(top_builddir)/librpl/librpl.a $(top_builddir)/src/librpl.a
       \rm -rf $(top_builddir)/librpl
       $(RANLIB) $(top_builddir)/src/librpl.a
Removed from v.1.15  
changed lines
  Added in v.1.27

CVSweb interface <joel.bertrand@systella.fr>