--- rpl/rplcas/Makefile.in	2011/06/01 08:56:34	1.6
+++ rpl/rplcas/Makefile.in	2011/06/27 14:30:20	1.10
@@ -1,16 +1,16 @@
 srcdir=@srcdir@
 top_builddir=@abs_top_builddir@
-
 .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=@ABI@ $(CFLAGS) \
+				../$(srcdir)/@GMP@/configure --with-readline=no \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
 	fi
@@ -21,7 +21,7 @@ lib/libmpfr.a: lib/libgmp.a
 		mkdir @MPFR@ ; \
 	fi
 	if [ ! -f @MPFR@/config.log ]; then \
-		(cd @MPFR@ && ../$(srcdir)/@MPFR@/configure \
+		(cd @MPFR@ && CFLAGS=@ABI@ $(CFLAGS) ../$(srcdir)/@MPFR@/configure \
 				--with-gmp=$(top_builddir)/rplcas \
 				--disable-shared --enable-static \
 				--prefix=$(top_builddir)/rplcas); \
@@ -70,14 +70,37 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 				--disable-gui --without-x && \
 				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
 	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
 
+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/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: all
 
 clean:
+	\rm -f $(top_builddir)/rplcas/lib/lib*
 
 distdir: