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

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

version 1.54, 2011/07/22 07:38:33 version 1.65, 2011/10/03 15:57:53
Line 1 Line 1
   include $(top_builddir)/tools/openmotif.lib
   
 ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a  ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.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 20  include_libcrypto = -I$(top_builddir)/to Line 22  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@
   
   ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/libsigsegv.a
   include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
   
 ldadd_librplcas = @LIBRPLCAS@  ldadd_librplcas = @LIBRPLCAS@
 include_librplcas = -I$(top_builddir)/rplcas/include/giac \  include_librplcas = -I$(top_builddir)/rplcas/include/giac \
         -I$(top_builddir)/rplcas/include          -I$(top_builddir)/rplcas/include
   
   ldadd_libmotif = @LIBMOTIF@
   include_libmotif = @INCMOTIF@
   
 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);}')\"" \
Line 31  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 139  SRCC=\ Line 146  SRCC=\
     instructions_l3.c\      instructions_l3.c\
     instructions_l4.c\      instructions_l4.c\
     instructions_l5.c\      instructions_l5.c\
       instructions_l6.c\
     instructions_m1.c\      instructions_m1.c\
     instructions_m2.c\      instructions_m2.c\
     instructions_m3.c\      instructions_m3.c\
Line 172  SRCC=\ Line 180  SRCC=\
     instructions_s8.c\      instructions_s8.c\
     instructions_s9.c\      instructions_s9.c\
     instructions_s10.c\      instructions_s10.c\
       instructions_s11.c\
     instructions_t1.c\      instructions_t1.c\
     instructions_t2.c\      instructions_t2.c\
     instructions_t3.c\      instructions_t3.c\
Line 196  SRCC=\ Line 205  SRCC=\
     rplcore.c\      rplcore.c\
     semaphores.c\      semaphores.c\
     sequenceur.c\      sequenceur.c\
     siginfo.c\  
     simplification.c\      simplification.c\
     sommations.c\      sommations.c\
     sql.c\      sql.c\
Line 258  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  %-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 375  generateurs.c: generateurs_aleatoires.aw Line 383  generateurs.c: generateurs_aleatoires.aw
   
 rpl.inc:  rpl.inc:
     echo BUILDPATH=$(top_builddir)/.. > $@      echo BUILDPATH=$(top_builddir)/.. > $@
     echo COMPILE=$(DEFS) | sed -e '1,$$s/"/\\"/g' | \      echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \
         sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@          sed -e '1,$$s/=\\"/="\\"/g' | sed -e '1,$$s/\\" /\\"" /g' >> $@
     echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@      echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
     echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \      echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
Line 393  rpl.inc: Line 401  rpl.inc:
         $(ldadd_libssl) \          $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) \
         $(ldadd_librplcas) \          $(ldadd_librplcas) \
           $(ldadd_libsigsegv) \
           $(ldadd_libmotif) \
         >> $@          >> $@
   
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \  EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
Line 409  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@  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ -Wl,-whole-archive \
                $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
                -Wl,-no-whole-archive
 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 429  include_HEADERS = rplexternals.h rpltype Line 441  include_HEADERS = rplexternals.h rpltype
 INCLUDES = -I$(srcdir) -I$(top_builddir) \  INCLUDES = -I$(srcdir) -I$(top_builddir) \
         $(include_libreadline) $(include_libncurses) $(include_libgsl) \          $(include_libreadline) $(include_libncurses) $(include_libgsl) \
         $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \          $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
         $(include_librplcas) \          $(include_librplcas) $(include_libsigsegv) \
           $(include_libmotif) \
         @includeX@ @libMySQLinc@ @libPgSQLinc@          @includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
         -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@ @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@          -D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"
 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 \
         $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \          $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
         $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \          $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
         $(ldadd_libsqlite) \          $(ldadd_libsqlite) $(ldadd_libsigsegv) \
         $(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@          $(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
   
 always: $(top_builddir)/src/rpl-conv.c  always: $(top_builddir)/src/rpl-conv.c
Line 471  librpl: install-libLIBRARIES Line 484  librpl: install-libLIBRARIES
             $(top_builddir)/lapack/blas/libblas.a \              $(top_builddir)/lapack/blas/libblas.a \
             $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \              $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \
             $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \              $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \
             $(ldadd_librplcas); \              $(ldadd_librplcas) $(ldadd_libsigsegv) $(ldadd_libmotif); \
     do \      do \
         cp -f $$i $(top_builddir)/librpl; \          cp -f $$i $(top_builddir)/librpl; \
     done      done
Line 496  librpl: install-libLIBRARIES Line 509  librpl: install-libLIBRARIES
                 do \                  do \
                     k=`echo $$i | wc -c`; \                      k=`echo $$i | wc -c`; \
                     j=`expr $$j + $$k + 1`; \                      j=`expr $$j + $$k + 1`; \
                     if test $$j -le 5000; then \                      if test $$j -le 8000; then \
                         L="$$L $$i"; \                          L="$$L $$i"; \
                     else \                      else \
                         break; \                          break; \
Line 511  librpl: install-libLIBRARIES Line 524  librpl: install-libLIBRARIES
             done; \              done; \
             echo Archive created; \              echo Archive created; \
             ar s librpl.a; \              ar s librpl.a; \
             if [ @OS@ != OS2 ]; then \              if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
                 echo Stripping librpl.a && strip -d librpl.a; \                  echo Stripping librpl.a && strip -d librpl.a; \
             fi;); \              fi;); \
     $(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a      $(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a
Removed from v.1.54  
changed lines
  Added in v.1.65

CVSweb interface <joel.bertrand@systella.fr>