--- rpl/src/Makefile.am	2013/04/27 08:56:25	1.88
+++ rpl/src/Makefile.am	2013/10/26 14:17:53	1.93
@@ -408,29 +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@ @ZLIB@ >> $@
-	@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) \
-		$(ldadd_libz) \
-		>> $@
+	@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) \
@@ -452,6 +460,7 @@ rpl_LDFLAGS = -g @PROFILAGE@ $(LIB) @EXP
 rpl_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -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
 
@@ -461,6 +470,7 @@ nodist_librpl_a_SOURCES = \
 librpl_a_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		-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
 
@@ -483,18 +493,19 @@ DEFS = -DHAVE_CONFIG_H -Dd_version_rpl=\
 		-Dd_forced_locale=@FORCED_FINAL_ENCODING@ \
 		-D@OS@ @BSH_PATH@ @RPLCAS@ -DHOST=\"@HOST@\" @SHARED_MEMORY@ \
 		@PSELECT@
-rpl_LDADD = -lgfortran \
+rpl_LDADD = \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
 		$(ldadd_libsqlite) $(ldadd_libsigsegv) \
-		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
+		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@ \
+		-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;
 
@@ -525,7 +536,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`; \
@@ -559,5 +570,8 @@ librpl: install-libLIBRARIES
 			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo "  STRIP  librpl.a" && strip -d librpl.a; \
 			fi;);
+	@if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
+		echo "  STRIP  rpl" && strip -d rpl; \
+	fi
 	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a