--- rpl/rplcas/Makefile.in	2011/06/27 14:30:20	1.10
+++ rpl/rplcas/Makefile.in	2011/09/08 09:39:41	1.17
@@ -1,5 +1,9 @@
 srcdir=@srcdir@
 top_builddir=@abs_top_builddir@
+CFLAGS=@CFLAGS@
+CXXFLAGS=@CXXFLAGS@
+LDFLAGS=@LDFLAGS@
+
 .PHONY: configure clean
 
 all: lib/librplcas.a
@@ -9,37 +13,47 @@ lib/libgmp.a:
 		mkdir @GMP@; \
 	fi
 	if [ ! -f @GMP@/config.log ]; then \
-		(cd @GMP@ && CFLAGS=@ABI@ $(CFLAGS) \
+		(cd @GMP@ && \
+				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 				../$(srcdir)/@GMP@/configure --with-readline=no \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
-	make -C @GMP@ $(AM_MAKEFLAGS) all && make -C $(AM_MAKEFLAGS) @GMP@ install
+	$(MAKE) -C @GMP@ $(AM_MAKEFLAGS) all && \
+			$(MAKE) -C $(AM_MAKEFLAGS) @GMP@ install
 
 lib/libmpfr.a: lib/libgmp.a
 	if [ ! -d @MPFR@ ]; then \
 		mkdir @MPFR@ ; \
 	fi
 	if [ ! -f @MPFR@/config.log ]; then \
-		(cd @MPFR@ && CFLAGS=@ABI@ $(CFLAGS) ../$(srcdir)/@MPFR@/configure \
+		(cd @MPFR@ && \
+				CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+				../$(srcdir)/@MPFR@/configure \
 				--with-gmp=$(top_builddir)/rplcas \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
-	make -C @MPFR@ $(AM_MAKEFLAGS) all && make -C @MPFR@ $(AM_MAKEFLAGS) install
+	$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) all && \
+			$(MAKE) -C @MPFR@ $(AM_MAKEFLAGS) install
 
-lib/ntl.a:
-	make -C @NTL@/src $(AM_MAKEFLAGS)
+@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
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
 
 lib/libcocoa.a: lib/libgmp.a
 	if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \
-		(cd @COCOA@ && ./configure --with-libgmp=../lib/libgmp.a \
+		(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+				./configure --with-libgmp=../lib/libgmp.a \
 				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
 	fi
-	make -C @COCOA@ $(AM_MAKEFLAGS) library
+	$(MAKE) -C @COCOA@ $(AM_MAKEFLAGS) library
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
 
@@ -50,7 +64,9 @@ lib/libpari.a: lib/libgmp.a
 				--without-readline --graphic=none -s); \
 		touch @PARI@/configured; \
 	fi
-	make -C @PARI@ $(AM_MAKEFLAGS) gp && make -C @PARI@ $(AM_MAKEFLAGS) install
+	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+			$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) gp && \
+			$(MAKE) -C @PARI@ $(AM_MAKEFLAGS) install
 
 lib/libgiac.a: lib/libgmp.a lib/libmpfr.a lib/ntl.a \
 		lib/libcocoa.a lib/libpari.a
@@ -76,10 +92,10 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 				sed -e 's/#define HAVE_PNG_H 1//' > config.h && \
 				\rm -f config.h.orig); \
 	fi
-	make -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
+	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) -f Makefile2
 	for i in mkinstalldirs xcas.xpm xcas.desktop xcas.applications; \
 	do cp $(srcdir)/@GIAC@/$$i @GIAC@/$$i; done
-	make -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
+	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
 
 lib/librplcas.a: lib/libgiac.a lib/libgmp.a lib/libmpfr.a
 	if [ ! -d tmp ]; then mkdir tmp; fi
@@ -98,7 +114,7 @@ lib/librplcas.a: lib/libgiac.a lib/libgm
 		   	ranlib ../lib/librplcas.a && strip -d ../lib/librplcas.a && \
 			\rm -rf tmp)
 
-install: all
+install:
 
 clean:
 	\rm -f $(top_builddir)/rplcas/lib/lib*