Diff for /rpl/src/Makefile.am between versions 1.1 and 1.7

version 1.1, 2010/01/26 15:22:45 version 1.7, 2010/03/05 11:20:08
Line 13  include_libgsl = -I$(top_builddir)/tools Line 13  include_libgsl = -I$(top_builddir)/tools
 ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a  ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 include_libiconv = -I$(top_builddir)/tools/@ICONV@/include  include_libiconv = -I$(top_builddir)/tools/@ICONV@/include
   
 date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z')\"" \  ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a
         -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z')\""  include_libcrypto = -I$(top_builddir)/tools/@ICONV@/include
   
   ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
   include_libsqlite = -I$(top_builddir)/tools/@SQLITE@/include
   
   date := -Dd_date_rpl="\"$(shell LC_ALL=fr_FR date +'%A %x, %X %Z' | \
           awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
           printf("%s\n", v);}')\"" \
           -Dd_date_en_rpl="\"$(shell LC_ALL=C date +'%A %x, %X %Z' | \
           awk '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
           printf("%s\n", v);}')\""
   
   hash := -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
           $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
           -Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
           $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
           -Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
           $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
           -Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
           $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
           -Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
           $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
           -Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
           $(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
           -Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum \
           $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
           -Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum \
           $(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
   
 SRCC=\  SRCC=\
     algebre_lineaire1.c\      algebre_lineaire1.c\
Line 24  SRCC=\ Line 51  SRCC=\
     analyse.c\      analyse.c\
     analyse_notation_algebrique.c\      analyse_notation_algebrique.c\
     analyse_notation_rpn.c\      analyse_notation_rpn.c\
       asprintf.c\
     bibliotheques_externes.c\      bibliotheques_externes.c\
     calcul_differentiel.c\      calcul_differentiel.c\
     calcul_integral.c\      calcul_integral.c\
     chainage.c\      chainage.c\
     compilation.c\      compilation.c\
     completion.c\      completion.c\
       controle.c \
     daemon.c\      daemon.c\
     date.c\      date.c\
     depassements.c\      depassements.c\
Line 327  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $ Line 356  CLEANFILES= $(SRCCc) $(SRCHc) $(SRCFc) $
   
 nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \  nodist_rpl_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
         $(SRCXPM) $(SRCINCc)          $(SRCXPM) $(SRCINCc)
 #rpl_LDFLAGS = -g @DEBUG@ @PROFILAGE@ $(LIB) -rdynamic  #rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -rdynamic
 rpl_LDFLAGS = -g @DEBUG@ @PROFILAGE@ $(LIB) -export-dynamic  rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) -export-dynamic
   
 rpl_CFLAGS = $(AM_CFLAGS) -D_REENTRANT -Wall -Wextra \  rpl_CFLAGS = $(AM_CFLAGS) -Wall -Wextra \
              -Wno-pointer-sign -Wno-unused-parameter               -Wno-pointer-sign -Wno-unused-parameter
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c  rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c  rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
   
 nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \  nodist_librpl_a_SOURCES = $(SRCCc) $(SRCHc) $(SRCFc) $(SRCF90c) $(INIT_LIBc) \
          $(SRCXPM) $(SRCINCc)           $(SRCXPM) $(SRCINCc)
 librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL -D_REENTRANT \  librpl_a_CFLAGS = $(AM_CFLAGS) -DLIBRPL \
         -Wall -Wextra -Wno-pointer-sign -Wno-unused-parameter          -Wall -Wextra -Wno-pointer-sign -Wno-unused-parameter
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c  librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore  librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
Line 346  include_HEADERS = rplexternals.h rpltype Line 375  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_libiconv) $(include_libcrypto) $(include_libsqlite)\
         @includeX@ @libMySQLinc@ @libPgSQLinc@          @includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \  DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
         -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG_CODE@ \          -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@ \
         @EXPERIMENTAL_CODE@ $(date) -g @PROFILAGE@ \          @EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
         -Dd_locale=\"$(shell locale charmap)\" \          -Dd_locale=\"$(shell locale charmap)\" \
         -D$(shell uname)          -D@OS@
 rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \  rpl_LDADD = $(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_libiconv) $(ldadd_libcrypto) $(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
Line 382  librpl: install-libLIBRARIES Line 411  librpl: install-libLIBRARIES
         addlib $(ldadd_libncurses)+ \          addlib $(ldadd_libncurses)+ \
         addlib $(ldadd_libgsl)+ \          addlib $(ldadd_libgsl)+ \
         addlib $(ldadd_libiconv)+ \          addlib $(ldadd_libiconv)+ \
           addlib $(ldadd_libcrypto)+ \
           addlib $(ldadd_libsqlite)+ \
         save+ \          save+ \
         end \          end \
     | tr '+' '\n' | ar -M; \      | tr '+' '\n' | ar -M; \

Removed from v.1.1  
changed lines
  Added in v.1.7


CVSweb interface <joel.bertrand@systella.fr>