--- rpl/rplcas/Makefile.in	2011/04/20 11:42:55	1.2
+++ rpl/rplcas/Makefile.in	2011/06/01 08:56:34	1.6
@@ -1,63 +1,83 @@
 srcdir=@srcdir@
 top_builddir=@abs_top_builddir@
 
-all: configure \
-		@GMP@/lib/libgmp.a \
-		@MPFR@/lib/libmpfr.a \
-		@NTL@/lib/ntl.a \
-		@COCOA@/lib/libcocoa.a \
-		@FLTK@/lib/libfltk.a
+.PHONY: configure clean
 
-@GMP@/lib/libgmp.a:
-	make -C @GMP@ all && make -C @GMP@ install
+all: lib/libgiac.a
 
-@MPFR@/lib/libmpfr.a:
-	make -C @MPFR@ all && make -C @MPFR@ install
-
-@NTL@/lib/ntl.a:
-	make -C @NTL@/src && cp @NTL@/src/ntl.a @NTL@/lib/ntl.a
-
-@COCOA@/lib/libcocoa.a:
-	make -C @COCOA@ library
-
-@FLTK@/lib/libfltk.a:
-	make -C @FLTK@ all && make -C @FLTK@ install
-
-configure:
+lib/libgmp.a:
 	if [ ! -d @GMP@ ]; then \
 		mkdir @GMP@; \
 	fi
 	if [ ! -f @GMP@/config.log ]; then \
 		(cd @GMP@ && ../$(srcdir)/@GMP@/configure --with-readline=no \
-				--prefix=$(top_builddir)/rplcas/@GMP@); \
+				--disable-shared --enable-static \
+				--prefix=$(top_builddir)/rplcas); \
 	fi
+	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 --with-gmp=../@GMP@ \
-				--prefix=$(top_builddir)/rplcas/@MPFR@); \
-	fi
-	if [ ! -d @NTL@/lib ]; then \
-		mkdir -p @NTL@/lib ; \
-	fi
+		(cd @MPFR@ && ../$(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
+
+lib/ntl.a:
+	make -C @NTL@/src $(AM_MAKEFLAGS)
+	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=../@GMP@/lib/libgmp.a \
-				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a) ;\
-	fi
-	if [ ! -f @FLTK@/config.log ]; then \
-		(cd @FLTK@ && ./configure \
-				--prefix=$(top_builddir)/rplcas/@FLTK@ \
-				--disable-xinerama --disable-xft --disable-xdbe); \
+		(cd @COCOA@ && ./configure --with-libgmp=../lib/libgmp.a \
+				--with-libgsl=../../tools/@GSL@/.libs/libgsl.a); \
 	fi
+	make -C @COCOA@ $(AM_MAKEFLAGS) library
+	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
+	cp -R @COCOA@/include/CoCoA include
+
+lib/libpari.a: lib/libgmp.a
+	if [ ! -f @PARI@/configured ]; then \
+		(cd @PARI@ && ./Configure --prefix=$(top_builddir)/rplcas \
+				--with-gmp=../lib/libgmp.a \
+				--without-readline --graphic=none -s); \
+		touch @PARI@/configured; \
+	fi
+	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 \
+		(cd @GIAC@ && \
+				CPPFLAGS="-I$(top_builddir)/rplcas/lib/include $(CPPFLAGS)" \
+				LDFLAGS="-L$(top_builddir)/rplcas/lib $(LDFLAGS)" \
+				../$(srcdir)/@GIAC@/configure --prefix=$(top_builddir)/rplcas \
+				--enable-pari=$(top_builddir)/rplcas \
+				--enable-ntl=$(top_builddir)/rplcas \
+				--enable-cocoa=$(top_builddir)/rplcas \
+				--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 \
+				> Makefile2); \
+	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
 
 install: all
 
-clean: configure
-	make -C @GMP@ clean
-	make -C @MPFR@ clean
-	\rm -f @NTL@/src/*.o
-	make -C @COCOA@ clean
-	make -C @FLTK@ clean
+clean:
 
 distdir: