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

version 1.64, 2011/09/26 15:57:08 version 1.69, 2011/10/10 16:38:29
Line 1 Line 1
 include $(top_builddir)/tools/openmotif.lib  include $(top_builddir)/tools/openmotif.lib
   
 ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a  ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a
 include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \  include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
         -I$(top_srcdir)/tools/@NCURSES@/include          -I$(top_srcdir)/tools/@NCURSES@/include
   
Line 9  ldadd_libreadline = $(top_builddir)/tool Line 9  ldadd_libreadline = $(top_builddir)/tool
 include_libreadline = -I$(top_srcdir)/tools/@READLINE@ \  include_libreadline = -I$(top_srcdir)/tools/@READLINE@ \
         -I$(top_builddir)/tools/@READLINE@ -DREADLINE_LIBRARY          -I$(top_builddir)/tools/@READLINE@ -DREADLINE_LIBRARY
   
 ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a  ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@  include_libgsl = -I$(top_builddir)/tools/@GSL@
   
 ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a  ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a
 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@/@LIB_PREFIX@crypto.a
 ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/libssl.a  ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.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/@LIB_PREFIX@sqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@  include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
   
 ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/libsigsegv.a  ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a
 include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src  include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
   
 ldadd_librplcas = @LIBRPLCAS@  ldadd_librplcas = @LIBRPLCAS@
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 > $@
   
Line 420  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc) Line 419  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc)
 nodist_rpl_SOURCES = \  nodist_rpl_SOURCES = \
         $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \          $(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ -Wl,-whole-archive \  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \
              $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \               $(ldadd_libmotif) $(LD_MOTIF_LIBS) \
              -Wl,-no-whole-archive               $(LD_MOTIF_X_XMU) @WHOLE_LIB2@
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \  rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -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 452  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\ Line 451  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
         @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \          @SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
         @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"@FINAL_ENCODING@\" \          -Dd_locale=\"@FINAL_ENCODING@\" \
         -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"          -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \
           @PSELECT@
 rpl_LDADD = -lgfortran \  rpl_LDADD = -lgfortran \
         $(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.64  
changed lines
  Added in v.1.69


CVSweb interface <joel.bertrand@systella.fr>