--- rpl/Makefile.am	2010/08/06 15:27:40	1.14
+++ rpl/Makefile.am	2010/09/07 13:31:52	1.20
@@ -1,4 +1,4 @@
-SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \
+SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack ptmalloc3 src \
 		rpltags scripts man doc
 
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
@@ -17,7 +17,7 @@ toolsdistclean:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 			@FILE@ @ICONV@ @SQLITE@; \
 	do \
-		\rm -rf $(srcdir)/tools/$$i; \
+		rm -rf $(srcdir)/tools/$$i; \
 	done;
 
 toolsclean:
@@ -52,11 +52,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 					print; \
 				} \
 			}' $$i > $$TMP; \
-			\mv -f $$TMP $$i; \
+			mv -f $$TMP $$i; \
 			echo -n " (fixed)"; \
 		else \
 			echo -n " (nothing to do)"; \
-			\rm -f $$TMP; \
+			rm -f $$TMP; \
 		fi; \
 		echo .; \
 	done;
@@ -70,7 +70,7 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 #				printf("../lib/libpanel.a ../lib/libncurses.a\n"); } \
 #			! /^TEST_ARGS/ \
 #				{ print; }' tools/@NCURSES@/test/Makefile > $$TMP; \
-#		\mv -f $$TMP $$i; \
+#		mv -f $$TMP $$i; \
 #		echo .; \
 #	done;
 	if [ @OS@ = "OS2" ]; then \
@@ -91,11 +91,11 @@ $(top_builddir)/tools/@NCURSES@/lib/libn
 				{ printf("CXX = g++\n"); } \
 			! /^CXX[ \t]/ \
 				{ print; }' > $$TMP; \
-		\mv -f $$TMP $(top_builddir)/tools/@NCURSES@/c++/Makefile; \
+		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 \
+		cp -f $(top_builddir)/tools/@NCURSES@/lib/ncurses.a \
 				$(top_builddir)/tools/@NCURSES@/lib/libncurses.a; \
 	fi
 
@@ -104,16 +104,15 @@ $(top_builddir)/tools/@READLINE@/libread
 	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GSL@/.libs/libgsl.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 \
-		mkdir $(top_builddir)/tools/@GSL@/.libs; \
-		for i in `grep ^SUBDIRS $(top_builddir)/tools/@GSL@/Makefile`; \
-		do \
-			(cd $(top_builddir)/tools/@GSL@/$$i && $(MAKE) $(AM_MAKEFLAGS) \
-					&& if [ -d .libs ]; then cd .libs && \
-					ar -cru ../../.libs/libgsl.a *.o; fi;); \
-		done; \
-	else \
-		(cd $(top_builddir)/tools/@GSL@ && $(MAKE) $(AM_MAKEFLAGS)); \
+		(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:
@@ -122,9 +121,9 @@ $(top_builddir)/tools/@ICONV@/lib/.libs/
 		TMP=$$(mktemp tmp.XXXXXXXXXX); \
 		awk '! /^[ \t]cd po/ { print; }' \
 				$(top_builddir)/tools/@ICONV@/Makefile > $$TMP; \
-		\mv -f $$TMP $(top_builddir)/tools/@ICONV@/Makefile; \
+		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 \
+		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; \
@@ -140,6 +139,9 @@ $(top_builddir)/rpliconv/rpliconv$(EXEEX
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 	$(MAKE) -C $(top_builddir)/rpliconv $(AM_MAKEFLAGS)
 
+$(top_builddir)/rplawk/rplawk$(EXEEXT):
+	$(MAKE) -C $(top_builddir)/rplawk $(AM_MAKEFLAGS)
+
 $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
@@ -162,7 +164,7 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 			print; \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP tools/@FILE@/src/Makefile
+	mv -f $$TMP tools/@FILE@/src/Makefile
 	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
@@ -184,21 +186,16 @@ $(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 \
+				cp $(top_builddir)/tools/@OPENSSL@/out/ssl.a \
 						$(top_builddir)/tools/@OPENSSL@/libssl.a; \
-				\cp $(top_builddir)/tools/@OPENSSL@/out/crypto.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)/ptmalloc3/libptmalloc3.a :
-	if [ @OS@ = "OS2" ]; then \
-		echo "unavailable for OS2" \
-				> $(top_builddir)/ptmalloc3/libptmalloc3.a; \
-	else \
-		$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS); \
-	fi
+	$(MAKE) -C $(top_builddir)/ptmalloc3 $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum: \
@@ -234,6 +231,7 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 		$(top_builddir)/lapack/blas/libblas.a \
 		$(top_builddir)/ptmalloc3/libptmalloc3.a \
 		$(top_builddir)/rpliconv/rpliconv$(EXEEXT) \
+		$(top_builddir)/rplawk/rplawk$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc \
 		$(top_builddir)/tools/rplsums/rplmd5sum \
@@ -243,3 +241,4 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
 	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)
+	if [ @OS@ = "OpenBSD" ]; then chmod 755 install-sh; fi