--- rpl/src/Makefile.am	2010/03/04 10:09:31	1.5
+++ rpl/src/Makefile.am	2010/03/06 18:29:06	1.8
@@ -10,9 +10,15 @@ include_libreadline = -I$(top_srcdir)/to
 ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@
 
-ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIBICONV@
+ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 include_libiconv = -I$(top_builddir)/tools/@ICONV@/include
 
+ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a
+include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/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);}')\"" \
@@ -20,6 +26,23 @@ date := -Dd_date_rpl="\"$(shell LC_ALL=f
 		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=\
 	algebre_lineaire1.c\
 	algebre_lineaire2.c\
@@ -35,6 +58,7 @@ SRCC=\
 	chainage.c\
 	compilation.c\
 	completion.c\
+	controle.c \
 	daemon.c\
 	date.c\
 	depassements.c\
@@ -351,19 +375,19 @@ include_HEADERS = rplexternals.h rpltype
 
 INCLUDES = -I$(srcdir) -I$(top_builddir) \
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
-		$(include_libiconv) \
+		$(include_libiconv) $(include_libcrypto) $(include_libsqlite)\
 		@includeX@ @libMySQLinc@ @libPgSQLinc@
 DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\"@VERSION@\" \
 		-Dd_exec_path=\"@RUNPATH@\" @FORCE_GNUPLOT_PATH@ @DEBUG@ \
 		@MOTIF_SUPPORT@ @POSTSCRIPT_SUPPORT@ @GNUPLOT_SUPPORT@ \
 		@VIM_SUPPORT@ @MYSQL_SUPPORT@ @POSTGRESQL_SUPPORT@ \
-		@EXPERIMENTAL_CODE@ $(date) -g @PROFILAGE@ \
+		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"$(shell locale charmap)\" \
 		-D@OS@
 rpl_LDADD = $(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
-		$(ldadd_libiconv) \
+		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libsqlite) \
 		$(ldadd_libgsl) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl.conv.c
@@ -387,6 +411,8 @@ librpl: install-libLIBRARIES
 		addlib $(ldadd_libncurses)+ \
 		addlib $(ldadd_libgsl)+ \
 		addlib $(ldadd_libiconv)+ \
+		addlib $(ldadd_libcrypto)+ \
+		addlib $(ldadd_libsqlite)+ \
 		save+ \
 		end \
 	| tr '+' '\n' | ar -M; \