--- rpl/rplcas/Makefile.in	2011/04/21 15:59:43	1.5
+++ rpl/rplcas/Makefile.in	2011/09/20 08:57:05	1.21
@@ -1,45 +1,57 @@
 srcdir=@srcdir@
 top_builddir=@abs_top_builddir@
+CFLAGS=@CFLAGS@
+CXXFLAGS=@CXXFLAGS@
+LDFLAGS=@LDFLAGS@
 
 .PHONY: configure clean
 
-all: lib/libgiac.a
+all: lib/librplcas.a
 
 lib/libgmp.a:
 	if [ ! -d @GMP@ ]; then \
 		mkdir @GMP@; \
 	fi
 	if [ ! -f @GMP@/config.log ]; then \
-		(cd @GMP@ && ../$(srcdir)/@GMP@/configure --with-readline=no \
+		(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@ && ../$(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)
+	(cd @NTL@/src && ./configure)
+	(cd @NTL@/src CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+		   	$(MAKE) $(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
 
 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,16 +62,18 @@ 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
 	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 \
@@ -68,16 +82,48 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 				--enable-gsl=../../tools/@GSL@/.libs/libgsl.a \
 				--disable-shared --enable-static \
 				--disable-gui --without-x && \
-				sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' Makefile | \
+				sed 's/SUBDIRS = src check intl po debianold debian doc examples/SUBDIRS = src check intl po debianold debian/g' Makefile \
 				> Makefile2); \
+		(cd @GIAC@/src && \
+				mv -f config.h config.h.orig && \
+				sed -e 's/#define HAVE_LIBPNG 1//' config.h.orig | \
+				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
 
-install: all
+lib/librplcas.a: lib/libgiac.a lib/libgmp.a lib/libmpfr.a
+	if [ ! -d tmp ]; then mkdir tmp; fi
+	(cd tmp && \
+			\rm -f * && \
+			ar x ../lib/libgmp.a && \
+			for i in `ar t ../lib/libgmp.a`; \
+			do mv $$i libgmp_$$i; done && \
+		   	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 && \
+		   	ar cru ../lib/librplcas.a lib* && \
+		   	ranlib ../lib/librplcas.a && strip -d ../lib/librplcas.a && \
+			\rm -rf tmp)
+
+install:
 
 clean:
+	\rm -f $(top_builddir)/rplcas/lib/lib*
 
 distdir: