--- rpl/src/Makefile.am	2013/05/24 18:21:02	1.89
+++ rpl/src/Makefile.am	2013/10/04 07:54:50	1.90
@@ -408,14 +408,22 @@ 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@ @ZLIB@ >> $@
-	@echo OBJECTS=$(SRCCc:.c=.$(OBJEXT)) $(SRCFc:.f=.$(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@ \
+	@echo RPL_EXTOBJECTS= @EXT_SQL@ \
 			$(top_builddir)/lapack/lapack/liblapack.a \
 			$(top_builddir)/lapack/blas/libblas.a \
 			$(ldadd_libhistory) \
@@ -527,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`; \