Diff for /rpl/src/Makefile.am between versions 1.64 and 1.65

version 1.64, 2011/09/26 15:57:08 version 1.65, 2011/10/03 15:57:53
Line 39  date = -Dd_date_rpl="\"$(shell LC_ALL=fr Line 39  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 @RPLTOOLS@/rplsums/rplmd5sum$(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$(EXEEXT) \          -Drplpp_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \          $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
         -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \          -Drplfile_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \          $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
         -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \          -Drplfile_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \          $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
         -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \          -Drpliconv_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \          -Drpliconv_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \          $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
         -Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \          -Drplawk_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \          $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
         -Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \          -Drplawk_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \          $(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
         -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \          -Drplconvert_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
         $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \          $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
         -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \          -Drplconvert_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
         $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""          $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
   
 SRCC=\  SRCC=\
Line 267  INIT_LIBc=$(INIT_LIB:.c=-conv.c) Line 266  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 \      @RPLTOOLS@/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m @RPLTOOLS@/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.cpp: %.cpp  %-conv.cpp: %.cpp
     $(top_builddir)/rpliconv/rpliconv \      @RPLTOOLS@/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m @RPLTOOLS@/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 \      @RPLTOOLS@/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m @RPLTOOLS@/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 \      @RPLTOOLS@/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m @RPLTOOLS@/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
     $(top_builddir)/rpliconv/rpliconv \      @RPLTOOLS@/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m @RPLTOOLS@/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 \      @RPLTOOLS@/rpliconv/rpliconv \
             -f `$(top_builddir)/tools/@FILE@/src/rplfile \              -f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
             -m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \              -m @RPLTOOLS@/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 > $@
   

Removed from v.1.64  
changed lines
  Added in v.1.65


CVSweb interface <joel.bertrand@systella.fr>