===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.30
retrieving revision 1.35
diff -u -p -r1.30 -r1.35
--- OpenXM/src/Makefile	2000/01/07 19:40:30	1.30
+++ OpenXM/src/Makefile	2000/01/08 16:38:32	1.35
@@ -1,12 +1,8 @@
 ## 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.34 2000/01/07 22:53:41 maekawa Exp $
 
-all1:
-	(cd kan96xx ; make all )
-	(cd kan96xx ; make install2)
-	(cd kxx ; make all)
-	(cd kxx ; make install2)
+all: 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)
@@ -14,6 +10,15 @@ all-asir:
 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) ; \
@@ -38,17 +43,14 @@ 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)
-
 clean:
 	/bin/rm -rf ../*~  *~
 	(cd kan96xx ; make clean )
 	(cd kxx ; make clean)
-	(cd Ti ; make clean)
-	(cd gnuplot ; make clean )
+	(cd tigers ; make clean)
+	(cd gnuplot ; make clean)
 	(cd phc ; make clean )
 	(cd k097 ; make clean )
 	(cd asir2000 ; make clean )
@@ -58,8 +60,8 @@ clean:
 distclean:
 	(cd kan96xx ; make distclean )
 	(cd kxx ; make clean)
-	(cd Ti ; make clean)
-	(cd gnuplot ; make clean )
+	(cd tigers ; make clean)
+	(cd gnuplot ; make distclean)
 	(cd phc ; make clean )
 	(cd k097 ; make clean )
 	(cd asir2000 ; make clean )
@@ -71,6 +73,7 @@ configure:
 	(cd ../bin ; ./configure2 )
 	(cd kxx ; make configure )
 	(cd kan96xx ; make configure )
+	(cd gnuplot ; make configure)
 	(cd pari ; ./Configure --prefix=../../../OpenXM)
 	(cd asir2000; ./configure)
 	(cd ox_math; ./configure)