--- rpl/src/Makefile.am	2011/11/15 07:01:37	1.70
+++ rpl/src/Makefile.am	2013/03/21 14:13:55	1.85
@@ -25,6 +25,9 @@ include_libsqlite = -I$(top_srcdir)/tool
 ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a
 include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
 
+ldadd_libz = $(top_builddir)/tools/@ZLIB@/libz.a
+include_libz = -I$(top_builddir)/tools/@ZLIB@
+
 ldadd_librplcas = @LIBRPLCAS@
 include_librplcas = -I$(top_builddir)/rplcas/include/giac \
 		-I$(top_builddir)/rplcas/include
@@ -73,6 +76,7 @@ SRCC=\
 	calcul_differentiel.c\
 	calcul_integral.c\
 	chainage.c\
+	chiffrement.c\
 	compilation.c\
 	completion.c\
 	controle.c \
@@ -115,6 +119,8 @@ SRCC=\
 	instructions_c5.c\
 	instructions_c6.c\
 	instructions_c7.c\
+	instructions_c8.c\
+	instructions_c9.c\
 	instructions_d1.c\
 	instructions_d2.c\
 	instructions_d3.c\
@@ -163,6 +169,7 @@ SRCC=\
 	instructions_p5.c\
 	instructions_p6.c\
 	instructions_p7.c\
+	instructions_p8.c\
 	instructions_q1.c\
 	instructions_r1.c\
 	instructions_r2.c\
@@ -170,6 +177,7 @@ SRCC=\
 	instructions_r4.c\
 	instructions_r5.c\
 	instructions_r6.c\
+	instructions_r7.c\
 	instructions_s1.c\
 	instructions_s2.c\
 	instructions_s3.c\
@@ -185,6 +193,7 @@ SRCC=\
 	instructions_t2.c\
 	instructions_t3.c\
 	instructions_u1.c\
+	instructions_u2.c\
 	instructions_v1.c\
 	instructions_v2.c\
 	instructions_w1.c\
@@ -251,7 +260,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz @MALLOC@
+LIB=@MALLOC@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -379,12 +388,12 @@ licences:
 	done
 
 librplprototypes.h: rpl.h conversion.awk
-	@echo "  AWK $@"
+	@echo "  AWK    $@"
 	@$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \
 			$(top_builddir)/src/librplprototypes.h
 
 generateurs.c: generateurs_aleatoires.awk
-	@echo "  AWK $@"
+	@echo "  AWK    $@"
 	@$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \
 			$(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \
 			$(top_builddir)/src/generateurs.c
@@ -394,7 +403,7 @@ rpl.inc:
 	@echo BUILDPATH=$(top_builddir)/.. > $@
 	@echo COMPILE="$(DEFS) @ABI@" | 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@ @ZLIB@ >> $@
 	@echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
@@ -412,6 +421,7 @@ rpl.inc:
 		$(ldadd_librplcas) \
 		$(ldadd_libsigsegv) \
 		$(ldadd_libmotif) \
+		$(ldadd_libz) \
 		>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
@@ -429,10 +439,11 @@ nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
 rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \
-			 $(ldadd_libmotif) $(LD_MOTIF_LIBS) \
-			 $(LD_MOTIF_X_XMU) @WHOLE_LIB2@
+		$(ldadd_libmotif) $(ldadd_libz) $(LD_MOTIF_LIBS) \
+		$(LD_MOTIF_X_XMU) @WHOLE_LIB2@
 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@ \
+		 -Wconversion
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
@@ -440,7 +451,8 @@ nodist_librpl_a_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCFc) $(SRCCPPc) $(SRCF90c) $(INIT_LIBc) \
 		$(SRCXPM) $(SRCINCc)
 librpl_a_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@ \
+		-Wconversion
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
 
@@ -451,8 +463,8 @@ INCLUDES = -I$(srcdir) -I$(top_builddir)
 		$(include_libreadline) $(include_libncurses) $(include_libgsl) \
 		$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
 		$(include_librplcas) $(include_libsigsegv) \
-		$(include_libmotif) \
-		@includeX@ @libMySQLinc@ @libPgSQLinc@
+		$(include_libmotif) $(include_libz) \
+		@SYSROOT@ @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@ \
@@ -460,6 +472,7 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
+		-Dd_forced_locale=@FORCED_FINAL_ENCODING@ \
 		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \
 		@PSELECT@
 rpl_LDADD = -lgfortran \