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

Diff for /rpl/src/Makefile.am between versions 1.28 and 1.29

version 1.28, 2010/07/31 10:34:17 version 1.29, 2010/08/06 15:26:42
Line 27  date = -Dd_date_rpl="\"$(shell LC_ALL=fr Line 27  date = -Dd_date_rpl="\"$(shell LC_ALL=fr
         $(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.h:
       $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
               $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) > $@
   
   hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(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$(EXEEXT) \
         $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
         -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \          -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \          $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
         -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \          $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
         -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \          -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \          -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \          $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
         -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \          -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""          $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
   
 SRCC=\  SRCC=\
Line 83  SRCC=\ Line 87  SRCC=\
     gestion_variables.c\      gestion_variables.c\
     gestion_variables_statiques.c\      gestion_variables_statiques.c\
     gestion_variables_partagees.c\      gestion_variables_partagees.c\
       getaddrinfo.c\
     indicateurs.c\      indicateurs.c\
     instructions_a1.c\      instructions_a1.c\
     instructions_a2.c\      instructions_a2.c\
Line 197  SRCH=\ Line 202  SRCH=\
     convert.h\      convert.h\
     copyright.h\      copyright.h\
     garanties.h\      garanties.h\
       getaddrinfo.h\
     gnuplot.h\      gnuplot.h\
     librpl.h\      librpl.h\
     licence.h\      licence.h\
Line 234  LIB=-lz @MALLOC@ Line 240  LIB=-lz @MALLOC@
 bin_PROGRAMS = rpl  bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a  lib_LIBRARIES = librpl.a
   
 SRCCc=$(SRCC:.c=.conv.c)  SRCCc=$(SRCC:.c=-conv.c)
 SRCHc=$(SRCH:.h=.conv.h)  SRCHc=$(SRCH:.h=-conv.h)
 SRCFc=$(SRCF:.f=.conv.f)  SRCFc=$(SRCF:.f=-conv.f)
 SRCF90c=$(SRCF90:.F90=.conv.F90)  SRCF90c=$(SRCF90:.F90=-conv.F90)
 SRCINCc=$(SRCINC:.inc=.conv.inc)  SRCINCc=$(SRCINC:.inc=-conv.inc)
 INIT_LIBc=$(INIT_LIB:.c=.conv.c)  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
     $(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 $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.h: %.h  %-conv.h: %.h
     $(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 $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.f: %.f  %-conv.f: %.f
     $(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 $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.F90: %.F90  %-conv.F90: %.F90
     $(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 $< | \
             $(AWK) -F= '{print $$2;}'` \              $(AWK) -F= '{print $$2;}'` \
             -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@              -t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
   
 %.conv.inc: %.inc  %-conv.inc: %.inc
     $(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 355  rpl.inc: Line 361  rpl.inc:
     echo BUILDPATH=$(top_builddir)/.. > $@      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=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
             librpl.conv.o >> $@              $(SRCF90c:.F90=.$(OBJEXT)) \
               librpl-conv.$(OBJEXT) >> $@
     echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \      echo EXTOBJECTS= @MALLOC@ @EXT_SQL@ \
         $(top_builddir)/lapack/lapack/liblapack.a \          $(top_builddir)/lapack/lapack/liblapack.a \
         $(top_builddir)/lapack/blas/libblas.a \          $(top_builddir)/lapack/blas/libblas.a \
Line 379  BUILT_SOURCES = librplprototypes.h gener Line 386  BUILT_SOURCES = librplprototypes.h gener
         rpl.inc          rpl.inc
 CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(SRCINCc) \
         $(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.$(OBJEXT)
   
 nodist_rpl_SOURCES = \  nodist_rpl_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \          $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -Wl,@EXPORT_DYNAMIC@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@
 rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \  rpl_CFLAGS = $(AM_CFLAGS) -std=gnu99 -Wall -Wextra -Wno-unused-function \
          -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@           -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
Line 421  rpl_LDADD = \ Line 428  rpl_LDADD = \
         $(ldadd_libsqlite) \          $(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
     touch $(top_builddir)/src/rpl.conv.c; \      touch $(top_builddir)/src/rpl.conv.c; \
     if [ x$(shell which ctags) != x ]; then \      if [ x$(shell which ctags) != x ]; then \
         (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \          (cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
Removed from v.1.28  
changed lines
  Added in v.1.29

CVSweb interface <joel.bertrand@systella.fr>