--- rpl/src/Makefile.am	2011/11/15 07:01:37	1.70
+++ rpl/src/Makefile.am	2012/04/08 18:03:09	1.75
@@ -163,6 +163,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 +171,7 @@ SRCC=\
 	instructions_r4.c\
 	instructions_r5.c\
 	instructions_r6.c\
+	instructions_r7.c\
 	instructions_s1.c\
 	instructions_s2.c\
 	instructions_s3.c\
@@ -251,7 +253,7 @@ INIT_EXE=init.c
 
 INIT_LIB=librpl.c
 
-LIB=-lz @MALLOC@
+LIB=@ZLIB@ @MALLOC@
 
 bin_PROGRAMS = rpl
 lib_LIBRARIES = librpl.a
@@ -379,12 +381,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 +396,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) >> $@
@@ -452,7 +454,7 @@ INCLUDES = -I$(srcdir) -I$(top_builddir)
 		$(include_libiconv) $(include_libcrypto) $(include_libsqlite) \
 		$(include_librplcas) $(include_libsigsegv) \
 		$(include_libmotif) \
-		@includeX@ @libMySQLinc@ @libPgSQLinc@
+		@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@ \