===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.22
retrieving revision 1.28
diff -u -p -r1.22 -r1.28
--- OpenXM/src/Makefile	2000/01/07 19:10:16	1.22
+++ OpenXM/src/Makefile	2000/01/07 19:36:51	1.28
@@ -1,6 +1,6 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.21 2000/01/07 18:46:19 maekawa Exp $
-all : all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all5 all6
+## $OpenXM: OpenXM/src/Makefile,v 1.27 2000/01/07 19:35:24 maekawa Exp $
+all : all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all-openmath all-oxmath
 
 all1 :
 	(cd kan96xx ; make all )
@@ -8,9 +8,32 @@ all1 :
 	(cd kxx ; make all)
 	(cd kxx ; make install2)
 
+all-asir:
+	(cd asir2000 ; xmkmf -a ; make ; make install ; make install2)
+
 all-gnuplot:
 	(cd gnuplot ; make all ; make install)
 
+all-oxmath:
+	@if test -d /usr/local/mathematica ; then \
+		(cd ox_math ; make) ; \
+	else \
+		echo -n "Warning: Mathematica is not found. " ; \
+		echo "ox_math will not be compiled." ; \
+	fi
+
+all-openmath:
+	@if ../misc/which.pl -s javac ; then \
+		(cd OpenMath ; make) ; \
+	else \
+		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)
 
@@ -19,25 +42,6 @@ all-tigers:
 
 all4 :
 	(cd k097 ; make all ; make install)
-all5 :
-	@if ../misc/which.pl -s javac ; then \
-		(cd OpenMath ; make ) ; \
-	else \
-		echo "Warning: javac (java compiler) is not found in your search path. OpenMath will not be compiled." ; \
-	fi
- 
-
-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)
-
 
 clean :
 	/bin/rm -rf ../*~  *~