--- rpl/src/Makefile.am	2011/09/16 14:42:03	1.62
+++ rpl/src/Makefile.am	2011/10/03 15:57:53	1.65
@@ -39,26 +39,25 @@ date = -Dd_date_rpl="\"$(shell LC_ALL=fr
 		$(AWK) '{ v=$$0; gsub(/^[ \t]+/, "", v); gsub(/[ \t]+$$/, "", v); \
 		printf("%s\n", v);}')\""
 
-
-hash = -Drplpp_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+hash = -Drplpp_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
-		-Drplpp_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplpp_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT))\"" \
-		-Drplfile_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drplfile_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
-		-Drplfile_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplfile_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT))\"" \
-		-Drpliconv_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drpliconv_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
-		-Drpliconv_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drpliconv_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT))\"" \
-		-Drplawk_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drplawk_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
-		-Drplawk_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplawk_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/rplawk/rplawk$(EXEEXT))\"" \
-		-Drplconvert_md5="\"$(shell $(top_builddir)/rplsums/rplmd5sum$(EXEEXT) \
+		-Drplconvert_md5="\"$(shell @RPLTOOLS@/rplsums/rplmd5sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\"" \
-		-Drplconvert_sha1="\"$(shell $(top_builddir)/rplsums/rplsha1sum$(EXEEXT) \
+		-Drplconvert_sha1="\"$(shell @RPLTOOLS@/rplsums/rplsha1sum$(EXEEXT) \
 		$(top_builddir)/tools/@UNITS@/units$(EXEEXT))\""
 
 SRCC=\
@@ -267,44 +266,44 @@ INIT_LIBc=$(INIT_LIB:.c=-conv.c)
 INIT_EXEc=$(INIT_EXE:.c=-conv.c)
 
 %-conv.c: %.c
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@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
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@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
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@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
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@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
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@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
-	$(top_builddir)/rpliconv/rpliconv \
-			-f `$(top_builddir)/tools/@FILE@/src/rplfile \
-			-m $(top_builddir)/tools/@FILE@/magic/magic -i $< | \
+	@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 > $@
 
@@ -420,7 +419,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@
+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_CFLAGS = $(AM_CFLAGS) @C_STANDARD@ -Wall -Wextra -Wno-unused-function \
 		 -Wno-pointer-sign -Wno-unused-parameter @NESTED_FUNCTIONS@
 rpl_FFLAGS = $(AM_FFLAGS) -fno-f2c
@@ -457,7 +458,6 @@ rpl_LDADD = -lgfortran \
 		$(ldadd_libhistory) $(ldadd_libreadline) $(ldadd_libncurses) \
 		$(ldadd_libiconv) $(ldadd_libcrypto) $(ldadd_libssl) \
 		$(ldadd_libsqlite) $(ldadd_libsigsegv) \
-		$(ldadd_libmotif) $(LD_MOTIF_LIBS) $(LD_MOTIF_X_XMU) \
 		$(ldadd_libgsl) $(ldadd_librplcas) @libX@ @libMySQLlib@ @libPgSQLlib@
 
 always: $(top_builddir)/src/rpl-conv.c
@@ -509,7 +509,7 @@ librpl: install-libLIBRARIES
 				do \
 					k=`echo $$i | wc -c`; \
 					j=`expr $$j + $$k + 1`; \
-					if test $$j -le 5000; then \
+					if test $$j -le 8000; then \
 						L="$$L $$i"; \
 					else \
 						break; \
@@ -524,7 +524,7 @@ librpl: install-libLIBRARIES
 			done; \
 			echo Archive created; \
 			ar s librpl.a; \
-			if [ @OS@ != OS2 ]; then \
+			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
 				echo Stripping librpl.a && strip -d librpl.a; \
 			fi;); \
 	$(INSTALL_DATA) $(top_builddir)/librpl/librpl.a $(DESTDIR)$(libdir)/librpl.a