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

Diff for /rpl/src/Makefile.am between versions 1.22 and 1.25

version 1.22, 2010/05/10 08:30:31 version 1.25, 2010/05/24 20:07:11
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 241  INIT_LIBc=$(INIT_LIB:.c=.conv.c) Line 241  INIT_LIBc=$(INIT_LIB:.c=.conv.c)
 INIT_EXEc=$(INIT_EXE:.c=.conv.c)  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
   
 %.conv.c: %.c  %.conv.c: %.c
       while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
               -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
               -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
               -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
               do sleep 1; done
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 248  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 253  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.h: %.h  %.conv.h: %.h
       while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
               -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
               -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
               -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
               do sleep 1; done
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 255  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 265  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.f: %.f  %.conv.f: %.f
       while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
               -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
               -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
               -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
               do sleep 1; done
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 262  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 277  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.F90: %.F90  %.conv.F90: %.F90
       while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
               -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
               -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
               -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
               do sleep 1; done
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 269  INIT_EXEc=$(INIT_EXE:.c=.conv.c) Line 289  INIT_EXEc=$(INIT_EXE:.c=.conv.c)
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.inc: %.inc  %.conv.inc: %.inc
       while [ ! \( -x $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
               -a -x $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
               -a -x $(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
               -a -x $(top_builddir)/tools/@UNITS@/units$(EXEEXT) \) ]; \
               do sleep 1; done
     $(top_builddir)/rpliconv/rpliconv \      $(top_builddir)/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `$(top_builddir)/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
Line 350  generateurs.c: generateurs_aleatoires.aw Line 375  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@ \
         $(top_builddir)/ptmalloc3/libptmalloc3.a \  
         $(top_builddir)/lapack/lapack/liblapack.a \          $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
         $(ldadd_libhistory) \          $(ldadd_libhistory) \
Line 410  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 434  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         @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)/ptmalloc3/libptmalloc3.a \  rpl_LDADD = @MALLOC@ \
         $(top_builddir)/lapack/lapack/liblapack.a \          $(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) \
Line 435  librpl: install-libLIBRARIES Line 459  librpl: install-libLIBRARIES
     if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi      if [ ! -d $(top_builddir)/librpl ]; then mkdir -p $(top_builddir)/librpl; fi
     \rm -rf $(top_builddir)/librpl/*      \rm -rf $(top_builddir)/librpl/*
     for i in $(top_builddir)/src/librpl.a \      for i in $(top_builddir)/src/librpl.a \
             $(top_builddir)/ptmalloc3/libptmalloc3.a \              @MALLOC@ \
             $(ldadd_libhistory) $(ldadd_libreadline) \              $(ldadd_libhistory) $(ldadd_libreadline) \
             $(top_builddir)/lapack/lapack/liblapack.a \              $(top_builddir)/lapack/lapack/liblapack.a \
             $(top_builddir)/lapack/blas/libblas.a \              $(top_builddir)/lapack/blas/libblas.a \
Removed from v.1.22  
changed lines
  Added in v.1.25

CVSweb interface <joel.bertrand@systella.fr>