--- rpl/Makefile.am	2010/05/22 21:45:49	1.12
+++ rpl/Makefile.am	2011/07/22 07:38:00	1.28
@@ -1,13 +1,15 @@
-SUBDIRS = tools rplsums rpliconv lapack/blas lapack/lapack ptmalloc3 src \
+SUBDIRS = tools rplsums rpliconv rplawk lapack/blas lapack/lapack rplcas src \
 		rpltags scripts man doc
 
+include_HEADERS = rplconfig.h
+
 EXTRA_DIST = LIMITATIONS Licence_CeCILL_V2-fr.txt Licence_CeCILL_V2-en.txt \
 		COPYING.in lapack/COPYING lapack/RELEASE \
 		tests/tests.tar.gz vim/indent/rpl.vim vim/ftplugin/rpl.vim \
 		vim/syntax/rpl.vim examples/obele.rpl examples/appel.tar.gz \
-		examples/external.tar.gz
-
-include_HEADERS = rplconfig.h
+		examples/external.tar.gz \
+		rplcas/@GMP@.tar.gz rplcas/@MPFR@.tar.gz rplcas/@NTL@.tar.gz \
+		rplcas/@COCOA@.tar.gz rplcas/@PARI@.tar.gz rplcas/@GIAC@.tar.gz
 
 licences:
 	cp -f $(top_builddir)/COPYING $(srcdir)
@@ -17,14 +19,14 @@ 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:
 	for i in @NCURSES@ @READLINE@ @UNITS@ @GSL@ @GPP@ @GNUPLOT_COMPILATION@ \
 			@FILE@ @ICONV@ @SQLITE@; \
 	do \
-		(cd $(top_builddir)/tools/$$i && $(MAKE) $(AM_MAKEFLAGS) clean); \
+		$(MAKE) -C $(top_builddir)/tools/$$i $(AM_MAKEFLAGS) clean); \
 	done;
 
 $(top_builddir)/tools/@NCURSES@/lib/libncurses.a:
@@ -52,11 +54,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,21 +72,64 @@ $(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;
-	(cd $(top_builddir)/tools/@NCURSES@ && $(MAKE) $(AM_MAKEFLAGS))
+	if [ @OS@ = "OS2" ]; then \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		awk \
+			'/^CXX_AR[ \t]/ \
+				{ printf("CXX_AR = $(AR)\n"); } \
+			! /^CXX_AR[ \t]/ \
+				{ print; }' \
+			$(top_builddir)/tools/@NCURSES@/c++/Makefile | \
+		awk \
+			'/^CXX_ARFLAGS[ \t]/ \
+				{ printf("CXX_ARFLAGS = $(ARFLAGS)\n"); } \
+			! /^CXX_ARFLAGS[ \t]/ \
+				{ print; }' | \
+		awk \
+			'/^CXX[ \t]/ \
+				{ printf("CXX = g++\n"); } \
+			! /^CXX[ \t]/ \
+				{ print; }' > $$TMP; \
+		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:
-	(cd $(top_builddir)/tools/@READLINE@ && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/tools/@READLINE@ $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GSL@/.libs/libgsl.a:
-	(cd $(top_builddir)/tools/@GSL@ && $(MAKE) $(AM_MAKEFLAGS))
+# 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:
 # La dépendance est faite par rpliconv.
-	(cd $(top_builddir)/tools/@ICONV@ && $(MAKE) $(AM_MAKEFLAGS))
+	if [ @OS@ = "OS2" ]; then \
+		TMP=$$(mktemp tmp.XXXXXXXXXX); \
+		awk '! /^[ \t]cd po/ { print; }' \
+				$(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
 
 $(top_builddir)/lapack/lapack/liblapack.a:
 	(cd $(top_builddir)/lapack/lapack && $(MAKE) $(AM_MAKEFLAGS))
@@ -94,9 +139,12 @@ $(top_builddir)/lapack/blas/libblas.a:
 
 $(top_builddir)/rpliconv/rpliconv$(EXEEXT): \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
-	(cd $(top_builddir)/rpliconv && $(MAKE) $(AM_MAKEFLAGS))
+	$(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 \
+$(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc: \
 		$(top_builddir)/tools/@ICONV@/lib/.libs/libiconv.a
 	TMP=$$(mktemp tmp.XXXXXXXXXX); \
@@ -118,26 +166,47 @@ $(top_builddir)/tools/@FILE@/src/rplfile
 			print; \
 		} \
 	}' tools/@FILE@/src/Makefile > $$TMP; \
-	\mv -f $$TMP tools/@FILE@/src/Makefile
-	(cd $(top_builddir)/tools/@FILE@ && $(MAKE) $(AM_MAKEFLAGS))
+	mv -f $$TMP tools/@FILE@/src/Makefile
+	$(MAKE) -C $(top_builddir)/tools/@FILE@ $(AM_MAKEFLAGS)
+	$(CC) -o $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
+			$(top_builddir)/tools/@FILE@/src/*.o \
+			$(shell grep '^LIBS =' $(top_builddir)/tools/@FILE@/Makefile | \
+			cut -d= -f2) $(LDFLAGS)
 
 $(top_builddir)/tools/@SQLITE@/.libs/libsqlite3.a:
-	(cd $(top_builddir)/tools/@SQLITE@ && $(MAKE) $(AM_MAKEFLAGS))
+	$(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:
-	(cd $(top_builddir)/tools/@OPENSSL@ && $(MAKE) $(AM_MAKEFLAGS))
-
-$(top_builddir)/ptmalloc3/libptmalloc3.a :
-		(cd $(top_builddir)/ptmalloc3 && $(MAKE) $(AM_MAKEFLAGS))
+	if [ @OS@ = "OS2" ]; then \
+		(cd $(top_builddir)/tools/@OPENSSL@ && \
+				sed -e '1,$$s/-m486/-mtune=i586 -DOPENSSL_USE_IPV6=0/g' \
+				OS2-EMX.mak | \
+				sed -e '1,$$s/-DBN_ASM/-UBN_ASM/g' | \
+				sed -e '1,$$s/-DMD5_ASM/-UMD5_ASM/g' | \
+				sed -e '1,$$s/-DSHA1_ASM/-USHA1_ASM/g' | \
+				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
-	(cd $(top_builddir)/rplsums && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/rplsums $(AM_MAKEFLAGS)
 
 $(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT):
-	(cd $(top_builddir)/tools/@GPP@ && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/tools/@GPP@ $(AM_MAKEFLAGS)
 
 .NOTPARALLEL: $(top_builddir)/tools/@FILE@/src/rplfile$(EXEEXT) \
 		$(top_builddir)/tools/@FILE@/magic/magic.mgc
@@ -151,6 +220,13 @@ $(top_builddir)/tools/@GPP@/src/gpp$(EXE
 .NOTPARALLEL: $(top_builddir)/tools/rplsums/rplmd5sum \
 		$(top_builddir)/tools/rplsums/rplsha1sum
 
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) install
+
+$(top_builddir)/rplcas/lib/librplcas.a: \
+		$(top_builddir)/tools/@GSL@/.libs/libgsl.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 \
@@ -160,14 +236,15 @@ all: $(top_builddir)/tools/@NCURSES@/lib
 		$(top_builddir)/tools/@OPENSSL@/libssl.a \
 		$(top_builddir)/lapack/lapack/liblapack.a \
 		$(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 \
 		$(top_builddir)/tools/rplsums/rplsha1sum \
-		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT)
+		$(top_builddir)/tools/@GPP@/src/gpp$(EXEEXT) \
+		@LIBRPLCAS@
 # Cette règle n'est là que pour forcer la compilation de Gnuplot.
-	(cd $(top_builddir)/tools && $(MAKE) $(AM_MAKEFLAGS))
-	(cd $(top_builddir)/rpltags && $(MAKE) $(AM_MAKEFLAGS))
-	(cd $(top_builddir)/src && $(MAKE) $(AM_MAKEFLAGS))
+	$(MAKE) -C $(top_builddir)/tools $(AM_MAKEFLAGS)
+	$(MAKE) -C $(top_builddir)/rpltags $(AM_MAKEFLAGS)
+	$(MAKE) -C $(top_builddir)/src $(AM_MAKEFLAGS)