--- rpl/src/Makefile.am	2011/10/03 15:57:53	1.65
+++ rpl/src/Makefile.am	2012/04/07 16:39:05	1.74
@@ -1,6 +1,6 @@
 include $(top_builddir)/tools/openmotif.lib
 
-ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/libncurses.a
+ldadd_libncurses = $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a
 include_libncurses = -I$(top_builddir)/tools/@NCURSES@/include \
 		-I$(top_srcdir)/tools/@NCURSES@/include
 
@@ -9,20 +9,20 @@ ldadd_libreadline = $(top_builddir)/tool
 include_libreadline = -I$(top_srcdir)/tools/@READLINE@ \
 		-I$(top_builddir)/tools/@READLINE@ -DREADLINE_LIBRARY
 
-ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/libgsl.a
+ldadd_libgsl = $(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a
 include_libgsl = -I$(top_builddir)/tools/@GSL@
 
-ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+ldadd_libiconv = $(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a
 include_libiconv = -I$(top_builddir)/tools/@ICONV@/include
 
-ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/libcrypto.a
-ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/libssl.a
+ldadd_libcrypto = $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a
+ldadd_libssl = $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a
 include_libcrypto = -I$(top_builddir)/tools/@OPENSSL@/include
 
-ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a
+ldadd_libsqlite = $(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a
 include_libsqlite = -I$(top_srcdir)/tools/@SQLITE@
 
-ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/libsigsegv.a
+ldadd_libsigsegv = $(top_builddir)/tools/@SIGSEGV@/src/.libs/@LIB_PREFIX@sigsegv.a
 include_libsigsegv = -I$(top_builddir)/tools/@SIGSEGV@/src
 
 ldadd_librplcas = @LIBRPLCAS@
@@ -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\
@@ -266,42 +268,48 @@ INIT_LIBc=$(INIT_LIB:.c=-conv.c)
 INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 
 %-conv.c: %.c
-	@RPLTOOLS@/rpliconv/rpliconv \
+	@echo "  CONV   $<"
+	@@RPLTOOLS@/rpliconv/rpliconv \
 			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
 			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.cpp: %.cpp
-	@RPLTOOLS@/rpliconv/rpliconv \
+	@echo "  CONV   $<"
+	@@RPLTOOLS@/rpliconv/rpliconv \
 			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
 			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.h: %.h
-	@RPLTOOLS@/rpliconv/rpliconv \
+	@echo "  CONV   $<"
+	@@RPLTOOLS@/rpliconv/rpliconv \
 			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
 			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.f: %.f
-	@RPLTOOLS@/rpliconv/rpliconv \
+	@echo "  CONV   $<"
+	@@RPLTOOLS@/rpliconv/rpliconv \
 			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
 			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.F90: %.F90
-	@RPLTOOLS@/rpliconv/rpliconv \
+	@echo "  CONV   $<"
+	@@RPLTOOLS@/rpliconv/rpliconv \
 			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
 			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
 			-t @FINAL_ENCODING@//TRANSLIT $< | expand -t 4 > $@
 
 %-conv.inc: %.inc
-	@RPLTOOLS@/rpliconv/rpliconv \
+	@echo "  CONV   $<"
+	@@RPLTOOLS@/rpliconv/rpliconv \
 			-f `@RPLTOOLS@/tools/@FILE@/src/rplfile \
 			-m @RPLTOOLS@/tools/@FILE@/magic/magic -i $< | \
 			$(AWK) -F= '{print $$2;}'` \
@@ -373,23 +381,26 @@ licences:
 	done
 
 librplprototypes.h: rpl.h conversion.awk
-	$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \
+	@echo "  AWK    $@"
+	@$(AWK) -f $(srcdir)/conversion.awk $(srcdir)/rpl.h > \
 			$(top_builddir)/src/librplprototypes.h
 
 generateurs.c: generateurs_aleatoires.awk
-	$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \
+	@echo "  AWK    $@"
+	@$(AWK) -f $(srcdir)/generateurs_aleatoires.awk \
 			$(srcdir)/../tools/@GSL@/rng/gsl_rng.h > \
 			$(top_builddir)/src/generateurs.c
 
 rpl.inc:
-	echo BUILDPATH=$(top_builddir)/.. > $@
-	echo COMPILE="$(DEFS) @ABI@" | sed -e '1,$$s/"/\\"/g' | \
+	@echo "  BUILD  $@"
+	@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 OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
+	@echo LINK=@libX@ @libMySQLlib@ @libPgSQLlib@ -lz >> $@
+	@echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(OBJEXT)) \
 			$(SRCF90c:.F90=.$(OBJEXT)) \
 			librpl-conv.$(OBJEXT) >> $@
-	echo EXTOBJECTS= @EXT_SQL@ \
+	@echo EXTOBJECTS= @EXT_SQL@ \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) \
@@ -419,9 +430,9 @@ CLEANFILES= $(SRCCc) $(SRCHc) $(SRCCPPc)
 nodist_rpl_SOURCES = \
 		$(SRCCc) $(SRCHc) $(SRCCPPc) $(SRCFc) $(SRCF90c) $(INIT_EXEc) \
 		$(SRCXPM) $(SRCINCc)
-rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ -Wl,-whole-archive \
-			 $(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
-			 -Wl,-no-whole-archive
+rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXPORT_DYNAMIC@ @ELF@ @WHOLE_LIB1@ \
+			 $(ldadd_libmotif) $(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@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
@@ -443,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@ \
@@ -451,7 +462,8 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		@SEMAPHORES_NOMMES@ @IPCS_SYSV@ @SEMUN@ @IPV6@ \
 		@EXPERIMENTAL_CODE@ $(date) $(hash) -g @PROFILAGE@ \
 		-Dd_locale=\"@FINAL_ENCODING@\" \
-		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\"
+		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \
+		@PSELECT@
 rpl_LDADD = -lgfortran \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
@@ -461,8 +473,8 @@ rpl_LDADD = -lgfortran \
 		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
-	touch $<; \
-	if [ x$(shell which ctags) != x ]; then \
+	@touch $<;
+	@if [ x$(shell which ctags) != x ]; then \
    		(cd $(srcdir); ctags $(SRCC) $(SRCF) $(SRCF90) \
 				$(INIT_LIB) $(INIT_EXE) 2>&1 /dev/null); \
 	fi;
@@ -474,11 +486,12 @@ all-local: always
 install-exec-local: librpl
 
 librpl: install-libLIBRARIES
-	if [ -d $(top_builddir)/librpl ]; then \
+	@echo "  BUILD  $@"
+	@if [ -d $(top_builddir)/librpl ]; then \
 		rm -rf $(top_builddir)/librpl; \
 	fi
-	mkdir -p $(top_builddir)/librpl; \
-	for i in $(top_builddir)/src/librpl.a \
+	@mkdir -p $(top_builddir)/librpl;
+	@for i in $(top_builddir)/src/librpl.a \
 			$(ldadd_libhistory) $(ldadd_libreadline) \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \
@@ -488,10 +501,10 @@ librpl: install-libLIBRARIES
 	do \
 		cp -f $$i $(top_builddir)/librpl; \
 	done
-	(cd $(top_builddir)/librpl && n=0 && \
-			echo Building standalone librpl.a; \
+	@(cd $(top_builddir)/librpl && n=0 && \
+			echo "    Building standalone librpl.a"; \
 			for i in *.a; \
-				do echo Extracting $$i; ar x $$i; \
+				do echo "    Extracting $$i"; ar x $$i; \
 				for j in `ar t $$i`; \
 				do cp -f $$j $$n-$$j; \
 					rm -f $$j; \
@@ -502,7 +515,7 @@ librpl: install-libLIBRARIES
 			L="start"; \
 			while test -n "$$L"; \
 			do \
-				echo -n "Remaining files "; \
+				echo -n "    Remaining files "; \
 				find . -name "*.$(OBJEXT)" | wc -l; \
 				L=""; j=0; \
 				for i in `find . -name "*.$(OBJEXT)"`; \
@@ -516,16 +529,16 @@ librpl: install-libLIBRARIES
 					fi; \
 				done; \
 				if test -n "$$L"; then \
-					echo -n "Adding files to librpl.a archive... "; \
+					echo -n "    Adding files to librpl.a archive... "; \
 					ar cru librpl.a $$L; \
 					rm -f $$L; \
 					echo "done"; \
 				fi; \
 			done; \
-			echo Archive created; \
+			echo "    Archive created"; \
 			ar s librpl.a; \
 			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
-				echo Stripping librpl.a && strip -d librpl.a; \
-			fi;); \
+				echo "  STRIP  librpl.a" && strip -d librpl.a; \
+			fi;);
 	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a