--- rpl/src/Makefile.am	2011/11/18 09:51:32	1.71
+++ rpl/src/Makefile.am	2013/10/04 07:54:50	1.90
@@ -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
@@ -32,12 +35,20 @@ include_librplcas = -I$(top_builddir)/rp
 ldadd_libmotif = @LIBMOTIF@
 include_libmotif = @INCMOTIF@
 
-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);}')\"" \
+date = -Dd_date_rpl="\"$(shell LC_ALL=C date +'%A' | \
+		$(AWK) '/Monday/ { printf("Lundi"); } \
+			/Tuesday/ { printf("Mardi"); } \
+			/Wednesday/ { printf("Mercredi"); } \
+			/Thursday/ { printf("Jeudi"); } \
+			/Friday/ { printf("Vendredi"); } \
+			/Saturday/ { printf("Samedi"); } \
+			/Sunday/ { printf("Dimanche"); }') \
+		$(shell LC_ALL=C date +'%d/%m/%Y, %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);}')\""
+			$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
+			printf("%s\n", v);}')\""
 
 hash = -Drplpp_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
@@ -73,6 +84,7 @@ SRCC=\
 	calcul_differentiel.c\
 	calcul_integral.c\
 	chainage.c\
+	chiffrement.c\
 	compilation.c\
 	completion.c\
 	controle.c \
@@ -115,6 +127,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 +177,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 +185,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 +201,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 +268,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz @MALLOC@
+LIB=@MALLOC@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -314,7 +331,7 @@ INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 licences:
-	cat $(srcdir)/../COPYING > $(srcdir)/licence.h
+	cat $(srcdir)/../HEADER > $(srcdir)/licence.h
 	echo >> $(srcdir)/licence.h
 	echo >> $(srcdir)/licence.h
 	echo "#ifndef INCLUSION_LICENCE" >> $(srcdir)/licence.h
@@ -334,7 +351,7 @@ licences:
 	echo "// vim: ts=4" >> $(srcdir)/licence.h
 	for i in $(SRCC) $(SRCCPP) $(SRCH) $(INIT_EXE) $(INIT_LIB); \
 	do \
-		cat $(srcdir)/../COPYING > $(srcdir)/tmp; \
+		cat $(srcdir)/../HEADER > $(srcdir)/tmp; \
 		echo >> $(srcdir)/tmp; \
 		echo >> $(srcdir)/tmp; \
 		$(AWK) -F'\n' 'BEGIN {d=0;} /^#/ {d=1;} {if(d==1) print $$1;}' \
@@ -343,11 +360,11 @@ licences:
 	done
 	for i in $(SRCINC); \
 	do \
-		iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \
-				$(srcdir)/../COPYING | \
+		iconv -f `file -i $(srcdir)/../HEADER | $(AWK) -F= '{print $$2;}'` \
+				$(srcdir)/../HEADER | \
 				$(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \
 				{printf("!%s\n", substr($$1,2));}' | \
-				iconv -t `file -i $(srcdir)/../COPYING | \
+				iconv -t `file -i $(srcdir)/../HEADER | \
 				$(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \
 		$(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
@@ -355,11 +372,11 @@ licences:
 	done
 	for i in $(SRCF); \
 	do \
-		iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \
-				$(srcdir)/../COPYING | \
+		iconv -f `file -i $(srcdir)/../HEADER | $(AWK) -F= '{print $$2;}'` \
+				$(srcdir)/../HEADER | \
 				$(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \
 				{printf("C%s\n", substr($$1,2));}' | \
-				iconv -t `file -i $(srcdir)/../COPYING | \
+				iconv -t `file -i $(srcdir)/../HEADER | \
 				$(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \
 		$(AWK) -F'\n' 'BEGIN {d=0;} ! /^C/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
@@ -367,11 +384,11 @@ licences:
 	done
 	for i in $(SRCF90); \
 	do \
-		iconv -f `file -i $(srcdir)/../COPYING | $(AWK) -F= '{print $$2;}'` \
-				$(srcdir)/../COPYING | \
+		iconv -f `file -i $(srcdir)/../HEADER | $(AWK) -F= '{print $$2;}'` \
+				$(srcdir)/../HEADER | \
 				$(AWK) -F'\n' '! (/^\/\*/ || /^\*\//) \
 				{printf("!%s\n", substr($$1,2));}' | \
-				iconv -t `file -i $(srcdir)/../COPYING | \
+				iconv -t `file -i $(srcdir)/../HEADER | \
 				$(AWK) -F= '{print $$2;}'` > $(srcdir)/tmp; \
 		$(AWK) -F'\n' 'BEGIN {d=0;} ! /^!/ {d=1;} {if(d==1) print $$1;}' \
 				$(srcdir)/$$i >> $(srcdir)/tmp; \
@@ -391,28 +408,37 @@ generateurs.c: generateurs_aleatoires.aw
 
 rpl.inc:
 	@echo "  BUILD  $@"
-	@echo BUILDPATH=$(top_builddir)/.. > $@
-	@echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \
+	@echo RPL_BUILDPATH=$(top_builddir)/.. > $@
+	@echo RPL_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 OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
-			$(SRCF90c:.F90=.$(OBJEXT)) \
+	@echo -n RPL_LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ @LIBS@ -lgfortran >> $@
+	@if [ -f $(top_builddir)/tools/openmotif.lib ]; then \
+		$(AWK) -F= '/^LD_MOTIF_LIBS/ { printf(" %s", $$2); }' \
+				$(top_builddir)/tools/openmotif.lib >> $@; \
+		$(AWK) -F= '/^LD_MOTIF_X_XMU/ { printf(" %s", $$2); }' \
+				$(top_builddir)/tools/openmotif.lib >> $@; \
+	fi
+	@echo >> $@
+	@echo RPL_FLAGS=-Wno-pointer-sign >> $@
+	@echo RPL_OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
+			$(SRCF90c:.F90=.$(OBJEXT)) $(SRCCPPc:.cpp=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
-	@echo EXTOBJECTS= @EXT_SQL@ \
-		$(top_builddir)/lapack/lapack/liblapack.a \
-		$(top_builddir)/lapack/blas/libblas.a \
-		$(ldadd_libhistory) \
-		$(ldadd_libreadline) \
-		$(ldadd_libncurses) \
-		$(ldadd_libgsl) \
-		$(ldadd_libiconv) \
-		$(ldadd_libcrypto) \
-		$(ldadd_libssl) \
-		$(ldadd_libsqlite) \
-		$(ldadd_librplcas) \
-		$(ldadd_libsigsegv) \
-		$(ldadd_libmotif) \
-		>> $@
+	@echo RPL_EXTOBJECTS= @EXT_SQL@ \
+			$(top_builddir)/lapack/lapack/liblapack.a \
+			$(top_builddir)/lapack/blas/libblas.a \
+			$(ldadd_libhistory) \
+			$(ldadd_libreadline) \
+			$(ldadd_libncurses) \
+			$(ldadd_libgsl) \
+			$(ldadd_libiconv) \
+			$(ldadd_libcrypto) \
+			$(ldadd_libssl) \
+			$(ldadd_libsqlite) \
+			$(ldadd_librplcas) \
+			$(ldadd_libsigsegv) \
+			$(ldadd_libmotif) \
+			$(ldadd_libz) \
+			>> $@
 
 EXTRA_DIST = $(SRCC) $(SRCH) $(SRCCPP) $(SRCF) $(SRCF90) $(SRCINC) \
 		$(INIT_EXE) $(INIT_LIB) $(SRCXPM) \
@@ -429,10 +455,12 @@ 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_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
 rpl_FCFLAGS = $(AM_FCFLAGS) -fno-second-underscore -fno-f2c
 
@@ -440,7 +468,9 @@ 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_CXXFLAGS = $(AM_CFLAGS) -Wall -Wextra
 librpl_a_FFLAGS = $(AM_FFLAGS) -ff2c
 librpl_a_FCFLAGS = $(AM_FCLAGS) -fno-second-underscore
 
@@ -451,8 +481,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 +490,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 \
@@ -473,7 +504,7 @@ rpl_LDADD = -lgfortran \
 always: $(top_builddir)/src/rpl-conv.c
 	@touch $<;
 	@if [ x$(shell which ctags) != x ]; then \
-   		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
+   		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) $(SRCCPP) \
 				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
 	fi;
 
@@ -504,7 +535,7 @@ librpl: install-libLIBRARIES
 			for i in *.a; \
 				do echo "    Extracting $$i"; ar x $$i; \
 				for j in `ar t $$i`; \
-				do cp -f $$j $$n-$$j; \
+				do cp -f $$j rpl-$$n-$$j; \
 					rm -f $$j; \
 				done; \
 				n=`expr $$n + 1`; \