===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- OpenXM/src/Makefile	2000/01/07 18:46:19	1.21
+++ OpenXM/src/Makefile	2000/01/07 19:26:24	1.25
@@ -1,6 +1,6 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.20 2000/01/07 18:38:12 maekawa Exp $
-all : all1 all3  all4 all-pari all-asir all-gnuplot all5 all6
+## $OpenXM: OpenXM/src/Makefile,v 1.24 2000/01/07 19:21:39 maekawa Exp $
+all : all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all-openmath all6
 
 all1 :
 	(cd kan96xx ; make all )
@@ -11,27 +11,33 @@ all1 :
 all-gnuplot:
 	(cd gnuplot ; make all ; make install)
 
-all3:
-	(cd Ti ; make all ; make install)
-	(cd phc ; make all ; make install )
-all4 :
-	(cd k097 ; make all ; make install)
-all5 :
+all-openmath:
 	@if ../misc/which.pl -s javac ; then \
-		(cd OpenMath ; make ) ; \
+		(cd OpenMath ; make) ; \
 	else \
-		echo "Warning: javac (java compiler) is not found in your search path. OpenMath will not be compiled." ; \
+		echo -n "Warning: javac (java compiler) is not found " ; \
+		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
- 
 
+all-pari:
+	(cd pari ; make install ; make install-lib-sta)
+	(cd pari ; ranlib ../../OpenXM/lib/libpari.a)
+
+all-phc:
+	(cd phc ; make all ; make install)
+
+all-tigers:
+	(cd Ti ; make all ; make install)
+
+all4 :
+	(cd k097 ; make all ; make install)
+
 all6 :
 	if test -d /usr/local/mathematica ; \
 	then \
 	(cd ox_math ; make ) ; \
 	fi 
 	   
-all-pari :
-	(cd pari ; make install ; make install-lib-sta ; ranlib ../../OpenXM/lib/libpari.a)
 all-asir : 
 	(cd asir2000; xmkmf -a; make; make install ; make install2)