--- rpl/rplcas/Makefile.in	2011/10/05 13:14:18	1.24
+++ rpl/rplcas/Makefile.in	2011/10/10 10:58:11	1.25
@@ -3,12 +3,13 @@ top_builddir=@abs_top_builddir@
 CFLAGS=@CFLAGS@
 CXXFLAGS=@CXXFLAGS@
 LDFLAGS=@LDFLAGS@
+OBJEXT=@OBJEXT@
 
 .PHONY: configure clean
 
 all: lib/librplcas.a
 
-lib/libgmp.a:
+lib/@LIB_PREFIX@gmp.a:
 	if [ ! -d @GMP@ ]; then \
 		mkdir @GMP@; \
 	fi
@@ -22,7 +23,7 @@ lib/libgmp.a:
 	$(MAKE) -C @GMP@ $(AM_MAKEFLAGS) all && \
 			$(MAKE) -C $(AM_MAKEFLAGS) @GMP@ install
 
-lib/libmpfr.a: lib/libgmp.a
+lib/@LIB_PREFIX@mpfr.a: lib/@LIB_PREFIX@gmp.a
 	if [ ! -d @MPFR@ ]; then \
 		mkdir @MPFR@ ; \
 	fi
@@ -45,7 +46,7 @@ lib/ntl.a:
 	cp @NTL@/src/ntl.a lib/ntl.a
 	cp -R @NTL@/include/NTL include
 
-lib/libcocoa.a: lib/libgmp.a
+lib/libcocoa.a: lib/@LIB_PREFIX@gmp.a
 	if [ ! -f @COCOA@/configuration/autoconf.mk ]; then \
 		(cd @COCOA@ && CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 				./configure --with-libgmp=../lib/libgmp.a \
@@ -55,7 +56,7 @@ lib/libcocoa.a: lib/libgmp.a
 	cp @COCOA@/lib/libcocoa.a lib/libcocoa.a
 	cp -R @COCOA@/include/CoCoA include
 
-lib/libpari.a: lib/libgmp.a
+lib/libpari.a: lib/@LIB_PREFIX@gmp.a
 	if [ ! -f @PARI@/configured ]; then \
 		(cd @PARI@ && ./Configure --prefix=$(top_builddir)/rplcas \
 				--with-gmp=../lib/libgmp.a \
@@ -66,7 +67,7 @@ lib/libpari.a: lib/libgmp.a
 			$(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/@LIB_PREFIX@giac.a: lib/@LIB_PREFIX@gmp.a lib/@LIB_PREFIX@mpfr.a lib/ntl.a \
 		lib/libcocoa.a lib/libpari.a
 	if [ ! -d @GIAC@ ]; then \
 		mkdir @GIAC@ ; \
@@ -97,31 +98,54 @@ lib/libgiac.a: lib/libgmp.a lib/libmpfr.
 	fi
 	$(MAKE) -C @GIAC@ $(AM_MAKEFLAGS) install -f Makefile2
 
-lib/librplcas.a: lib/libgiac.a lib/libgmp.a lib/libmpfr.a
+lib/librplcas.a: lib/@LIB_PREFIX@giac.a lib/@LIB_PREFIX@gmp.a \
+		lib/@LIB_PREFIX@mpfr.a lib/ntl.a lib/libcocoa.a lib/libpari.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)
+	(cd tmp && n=0 && \
+			rm -f * && \
+			echo Building standalone librplcas.a; \
+			for i in ../lib/@LIB_PREFIX@gmp.a \
+					../lib/@LIB_PREFIX@mpfr.a \
+					../lib/libcocoa.a \
+					../lib/libpari.a \
+					../lib/ntl.a \
+					../lib/@LIB_PREFIX@giac.a; \
+				do echo Extracting $$i; ar x $$i; \
+				for j in `ar t $$i`; \
+				do cp -f $$j $$n-$$j; \
+					rm -f $$j; \
+				done; \
+				n=`expr $$n + 1`; \
+			done; \
+			L="start"; \
+			while test -n "$$L"; \
+			do \
+				echo -n "Remaining files "; \
+				find . -name "*.$(OBJEXT)" | wc -l; \
+				L=""; j=0; \
+				for i in `find . -name "*.$(OBJEXT)"`; \
+				do \
+					k=`echo $$i | wc -c`; \
+					j=`expr $$j + $$k + 1`; \
+					if test $$j -le 8000; then \
+						L="$$L $$i"; \
+					else \
+						break; \
+					fi; \
+				done; \
+				if test -n "$$L"; then \
+					echo -n "Adding files to librplcas.a archive... "; \
+					ar cru ../lib/librplcas.a $$L; \
+					rm -f $$L; \
+					echo "done"; \
+				fi; \
+			done; \
+			echo Archive created; \
+			ar s ../lib/librplcas.a; \
+			if [ @OS@ != OS2 -a @OS@ != Darwin ]; then \
+				echo Stripping librplcas.a && strip -d ../lib/librplcas.a; \
+			fi;)
+	rmdir tmp
 
 install: