--- rpl/rplcas/Makefile.in	2011/09/08 09:39:41	1.17
+++ rpl/rplcas/Makefile.in	2011/09/08 15:24:24	1.19
@@ -37,12 +37,10 @@ lib/libmpfr.a: lib/libgmp.a
 	$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) all && \
 			$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) install
 
-@NTL@/src/makefile2: @NTL@/src/makefile
-	sed 's/\tmake/\t\$$(MAKE)/g' $< > $@
-	
-lib/ntl.a: @NTL@/src/makefile2
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-		   	$(MAKE) -C @NTL@/src $(AM_MAKEFLAGS) -f makefile2
+lib/ntl.a:
+	(cd @NTL@/src && ./configure && \
+			CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		   	$(MAKE) -C @NTL@/src $(AM_MAKEFLAGS) -f makefile)
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
@@ -73,9 +71,9 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
 	fi
-	if [ ! -f @GIAC@/config.log ]; then \
+	if [ ! -f @GIAC@/Makefile2 ]; then \
 		(cd @GIAC@ && \
-				CPPFLAGS="-I$(top_builddir)/rplcas/lib/include $(CPPFLAGS)" \
+				CPPFLAGS="-I$(top_builddir)/rplcas/include $(CPPFLAGS)" \
 				LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
 				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
 				--enable-pari=$(top_builddir)/rplcas \
@@ -107,6 +105,15 @@ lib/librplcas.a: lib/libgiac.a lib/libgm
 		   	ar x ../lib/libmpfr.a && \
 		   	for i in `ar t ../lib/libmpfr.a`; \
 		   	do mv $$i libmpfr_$$i; done && \
+			ar x ../lib/libcocoa.a && \
+			for i in `ar t ../lib/libcocoa.a`; \
+			do mv $$i libcocoa_$$i; done && \
+			ar x ../lib/libpari.a && \
+			for i in `ar t ../lib/libpari.a`; \
+			do mv $$i libpari_$$i; done && \
+			ar x ../lib/ntl.a && \
+			for i in `ar t ../lib/ntl.a`; \
+			do mv $$i libntl_$$i; done && \
 		   	ar x ../lib/libgiac.a && \
 		   	for i in `ar t ../lib/libgiac.a`; \
 		   	do mv $$i libgiac_$$i; done && \