===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.30
retrieving revision 1.39
diff -u -p -r1.30 -r1.39
--- OpenXM/src/Makefile	2000/01/07 19:40:30	1.30
+++ OpenXM/src/Makefile	2000/01/08 18:36:25	1.39
@@ -1,19 +1,24 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.29 2000/01/07 19:38:49 maekawa Exp $
-all: all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all-openmath all-oxmath
+## $OpenXM: OpenXM/src/Makefile,v 1.38 2000/01/08 18:25:36 maekawa Exp $
 
-all1:
-	(cd kan96xx ; make all )
-	(cd kan96xx ; make install2)
-	(cd kxx ; make all)
-	(cd kxx ; make install2)
+all: configure all-kan96xx all-kxx all-tigers all-phc all-k097 \
+     all-pari all-asir all-gnuplot all-openmath all-oxmath
 
 all-asir:
-	(cd asir2000 ; xmkmf -a ; make ; make install ; make install2)
+	(cd asir2000 ; make ; make install ; make install2)
 
 all-gnuplot:
 	(cd gnuplot ; make all ; make install)
 
+all-kan96xx:
+	(cd kan96xx ; make all ; make install2)
+
+all-kxx:
+	(cd kxx ; make all ; make install2)
+
+all-k097:
+	(cd k097 ; make all ; make install)
+
 all-openmath:
 	@if ../misc/which.pl -s javac ; then \
 		(cd OpenMath ; make) ; \
@@ -30,47 +35,49 @@ all-oxmath:
 		echo "ox_math will not be compiled." ; \
 	fi
 
-all-pari:
-	(cd pari ; make install ; make install-lib-sta)
-	(cd pari ; ranlib ../../OpenXM/lib/libpari.a)
+all-pari: configure-pari
+	(cd pari ; make all)
 
 all-phc:
 	(cd phc ; make all ; make install)
 
 all-tigers:
-	(cd Ti ; make all ; make install)
+	(cd tigers ; make all ; make install)
 
-all4:
-	(cd k097 ; make all ; make install)
+install: install-pari
 
+install-pari: all-pari
+	(cd pari ; make install ; ranlib ../../../OpenXM/lib/libpari.a)
+
 clean:
-	/bin/rm -rf ../*~  *~
-	(cd kan96xx ; make clean )
+	(cd kan96xx ; make clean)
 	(cd kxx ; make clean)
-	(cd Ti ; make clean)
-	(cd gnuplot ; make clean )
-	(cd phc ; make clean )
-	(cd k097 ; make clean )
-	(cd asir2000 ; make clean )
-#	(cd ox_math ; make clean )
+	(cd tigers ; make clean)
+	(cd gnuplot ; make clean)
+	(cd pari ; make clean)
+	(cd phc ; make clean)
+	(cd k097 ; make clean)
+	(cd asir2000 ; make clean)
+#	(cd ox_math ; make clean)
 	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6 bin/tigers bin/k0 bin/oxweave bin/gp-2.0 bin/gphelp bin/fep.linux bin/lin_phcv2p
 
-distclean:
-	(cd kan96xx ; make distclean )
-	(cd kxx ; make clean)
-	(cd Ti ; make clean)
-	(cd gnuplot ; make clean )
-	(cd phc ; make clean )
-	(cd k097 ; make clean )
-	(cd asir2000 ; make clean )
-#	(cd ox_math ; make clean )
-	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6 bin/tigers bin/k0 bin/oxweave bin/gp-2.0 bin/gphelp bin/fep.linux bin/lin_phcv2p
+distclean: clean
+	(cd kan96xx ; make distclean)
+	(cd gnuplot ; make distclean)
+	(cd pari ; make distclean)
 
-configure:
-	./make-links
-	(cd ../bin ; ./configure2 )
-	(cd kxx ; make configure )
-	(cd kan96xx ; make configure )
-	(cd pari ; ./Configure --prefix=../../../OpenXM)
-	(cd asir2000; ./configure)
+configure: configure-links configure-asir
+	(cd ../bin ; ./configure2)
+	(cd kxx ; make configure)
+	(cd kan96xx ; make configure)
+	(cd gnuplot ; make configure)
 	(cd ox_math; ./configure)
+
+configure-asir: install-pari
+	(cd asir2000; ./configure ; xmkmf -a ; make depend)
+
+configure-links:
+	./make-links
+
+configure-pari:
+	(cd pari ; make configure)