--- rpl/Makefile.am	2011/10/05 13:14:17	1.31
+++ rpl/Makefile.am	2011/10/10 10:58:10	1.32
@@ -29,7 +29,7 @@ toolsclean:
 		$(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
 	done;
 
-$(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
+$(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a:
 	for i in $(shell find tools/@NCURSES@ -name Makefile \
 		 -exec grep static {} /dev/null \; | cut -d: -f1); \
 	do \
@@ -68,8 +68,10 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 		TMP=tmp.ncurses_test; \
 		awk \
 			'/^TEST_ARGS/ \
-				{ printf("TEST_ARGS = ../lib/libform.a ../lib/libmenu.a "); \
-				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
+				{ printf("TEST_ARGS = ../lib/@LIB_PREFIX@form.a \
+						../lib/@LIB_PREFIX@menu.a "); \
+				printf("../lib/@LIB_PREFIX@panel.a \
+						../lib/@LIB_PREFIX@ncurses.a\n"); } \
 			! /^TEST_ARGS/ \
 				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
 		mv -f $$TMP $$i; \
@@ -96,28 +98,20 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 		mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
 	fi;
 	$(MAKE) -C $(top_builddir)/tools/@NCURSES@ $(AM_MAKEFLAGS)
-	if [ @OS@ = "OS2" ]; then \
-		cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
-				$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \
-	fi
 
-$(top_builddir)/tools/@READLINE@/libreadline.a \
-		$(top_builddir)/tools/@READLINE@/libhistory.a:
+$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \
+		$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a:
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
-$(top_builddir)/tools/@GSL@/.libs/libgsl.a:
+$(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a:
 # Quick and dirty hack pour avaliser le remplacement de ${1 + "$@"}
 # dans ltmain.sh et propager les modifications dans le script libtool.
 	if [ @OS@ = "OS2" ]; then \
 		(cd $(top_builddir)/tools/@GSL@ && configure --disable-shared;); \
 	fi
 	$(MAKE) -C $(top_builddir)/tools/@GSL@ $(AM_MAKEFLAGS)
-	if [ @OS@ = "OS2" ]; then \
-		cp $(top_builddir)/tools/@GSL@/.libs/gsl.a \
-				$(top_builddir)/tools/@GSL@/.libs/libgsl.a; \
-	fi
 
-$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a:
+$(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a:
 # La dépendance est faite par rpliconv.
 	if [ @OS@ = "OS2" ]; then \
 		TMP=tmp.libiconv; \
@@ -125,8 +119,6 @@ $(top_builddir)/tools/@ICONV@/lib/.libs/
 				$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \
 		mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
 		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
-		cp -f $(top_builddir)/tools/@ICONV@/lib/.libs/iconv.a \
-				$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a; \
 	else \
 		$(MAKE) -C $(top_builddir)/tools/@ICONV@ $(AM_MAKEFLAGS) all; \
 	fi
@@ -138,7 +130,7 @@ $(top_builddir)/lapack/blas/libblas.a:
 	(cd $(top_builddir)/lapack/blas && $(MAKE) $(AM_MAKEFLAGS))
 
 $(top_builddir)/rpliconv/rpliconv$(EXEEXT): \
-		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+		$(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a
 	$(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS)
 
 $(top_builddir)/rplawk/rplawk$(EXEEXT):
@@ -146,7 +138,7 @@ $(top_builddir)/rplawk/rplawk$(EXEEXT):
 
 $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
-		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
+		$(top_builddir)/tools/@ICONV@/lib/.libs/@LIB_PREFIX@iconv.a
 	TMP=tmp.rplfile; \
 	awk \
 	'{ \
@@ -173,15 +165,11 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
 			cut -d= -f2) $(LDFLAGS)
 
-$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
+$(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a:
 	$(MAKE) -C $(top_builddir)/tools/@SQLITE@ $(AM_MAKEFLAGS)
-	if [ @OS@ = "OS2" ]; then \
-		cp $(top_builddir)/tools/@SQLITE@/.libs/sqlite3.a \
-				$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a; \
-	fi
 
-$(top_builddir)/tools/@OPENSSL@/libcrypto.a \
-		$(top_builddir)/tools/@OPENSSL@/libssl.a:
+$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
+		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a:
 	if [ @OS@ = "OS2" ]; then \
 		(cd $(top_builddir)/tools/@OPENSSL@ && \
 				sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
@@ -192,17 +180,13 @@ $(top_builddir)/tools/@OPENSSL@/libcrypt
 				sed -e '1,$$s/-DOPENSSL_BN_ASM_PART_WORDS/-UOPENSSL_BN_ASM_PART_ASM/g' \
 				> OS2-EMX.mak2; \
 				$(MAKE) -j1 -f OS2-EMX.mak2 $(AM_MAKEFLAGS)); \
-				cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
-						$(top_builddir)/tools/@OPENSSL@/libssl.a; \
-				cp $(top_builddir)/tools/@OPENSSL@/out/crypto.a \
-						$(top_builddir)/tools/@OPENSSL@/libcrypto.a; \
 	else \
 		(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) -j1 $(AM_MAKEFLAGS)); \
 	fi
 
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \
-		$(top_builddir)/tools/@OPENSSL@/libcrypto.a
+		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a
 	$(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
@@ -211,11 +195,11 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc
 
-.NOTPARALLEL: $(top_builddir)/tools/@READLINE@/libreadline.a \
-		$(top_builddir)/tools/@READLINE@/libhistory.a
+.NOTPARALLEL: $(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \
+		$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a
 
-.NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/libcrypto.a \
-		$(top_builddir)/tools/@OPENSSL@/libssl.a
+.NOTPARALLEL: $(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
+		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@ssl.a
 
 .NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum
@@ -224,15 +208,15 @@ install-strip:
 	$(MAKE) $(AM_MAKEFLAGS) install
 
 $(top_builddir)/rplcas/lib/librplcas.a: \
-		$(top_builddir)/tools/@GSL@/.libs/libgsl.a
+		$(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a
 	$(MAKE) -C $(top_builddir)/rplcas $(AM_MAKEFLAGS)
 
-all: $(top_builddir)/tools/@NCURSES@/lib/libncurses.a \
-		$(top_builddir)/tools/@READLINE@/libreadline.a \
-		$(top_builddir)/tools/@READLINE@/libhistory.a \
-		$(top_builddir)/tools/@GSL@/.libs/libgsl.a \
-		$(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a \
-		$(top_builddir)/tools/@OPENSSL@/libcrypto.a \
+all: $(top_builddir)/tools/@NCURSES@/lib/@LIB_PREFIX@ncurses.a \
+		$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@readline.a \
+		$(top_builddir)/tools/@READLINE@/@LIB_PREFIX@history.a \
+		$(top_builddir)/tools/@GSL@/.libs/@LIB_PREFIX@gsl.a \
+		$(top_builddir)/tools/@SQLITE@/.libs/@LIB_PREFIX@sqlite3.a \
+		$(top_builddir)/tools/@OPENSSL@/@LIB_PREFIX@crypto.a \
 		$(top_builddir)/tools/@OPENSSL@/libssl.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(top_builddir)/lapack/blas/libblas.a \