--- rpl/src/Makefile.am 2011/06/23 13:03:39 1.51 +++ rpl/src/Makefile.am 2011/06/23 13:41:16 1.52 @@ -20,6 +20,9 @@ include_libcrypto = -I$(top_builddir)/to ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@ +ldadd_libgiac = $(top_builddir)/rplcas/lib/libgiac.a +include_libgiac = -I$(top_builddir)/rplcas/include/giac + 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);}')\"" \ @@ -423,7 +426,8 @@ include_HEADERS = rplexternals.h rpltype INCLUDES = -I$(srcdir) -I$(top_builddir) \ $(include_libreadline) $(include_libncurses) $(include_libgsl) \ - $(include_libiconv) $(include_libcrypto) $(include_libsqlite)\ + $(include_libiconv) $(include_libcrypto) $(include_libsqlite) \ + $(include_libgiac) \ @includeX@ @libMySQLinc@ @libPgSQLinc@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" @BROKEN_SIGINFO@ \ -Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \ @@ -439,7 +443,7 @@ rpl_LDADD = \ $(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \ $(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \ $(ldadd_libsqlite) \ - $(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@ + $(ldadd_libgsl) $(ldadd_libgiac) @libX@ @libMySQLlib@ @libPgSQLlib@ always: $(top_builddir)/src/rpl-conv.c touch $<; \ @@ -464,7 +468,8 @@ librpl: install-libLIBRARIES $(top_builddir)/lapack/lapack/liblapack.a \ $(top_builddir)/lapack/blas/libblas.a \ $(ldadd_libncurses) $(ldadd_libgsl) $(ldadd_libiconv) \ - $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite); \ + $(ldadd_libcrypto) $(ldadd_libssl) $(ldadd_libsqlite) \ + $(ldadd_libgiac); \ do \ cp -f $$i $(top_builddir)/librpl; \ done