===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.26
retrieving revision 1.32
diff -u -p -r1.26 -r1.32
--- OpenXM/src/Makefile	2000/01/07 19:28:32	1.26
+++ OpenXM/src/Makefile	2000/01/07 19:47:51	1.32
@@ -1,19 +1,22 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.25 2000/01/07 19:26:24 maekawa Exp $
-all : all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all-openmath all6
+## $OpenXM: OpenXM/src/Makefile,v 1.31 2000/01/07 19:45:25 maekawa Exp $
+all: all-kan96xx all-kxx all-tigers all-phc all-k097 all-pari all-asir all-gnuplot all-openmath all-oxmath
 
-all1 :
-	(cd kan96xx ; make all )
-	(cd kan96xx ; make install2)
-	(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-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) ; \
@@ -22,6 +25,14 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
+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-pari:
 	(cd pari ; make install ; make install-lib-sta)
 	(cd pari ; ranlib ../../OpenXM/lib/libpari.a)
@@ -32,20 +43,7 @@ all-phc:
 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-asir : 
-	(cd asir2000; xmkmf -a; make; make install ; make install2)
-
-
-clean :
+clean:
 	/bin/rm -rf ../*~  *~
 	(cd kan96xx ; make clean )
 	(cd kxx ; make clean)
@@ -57,8 +55,7 @@ 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 :
+distclean:
 	(cd kan96xx ; make distclean )
 	(cd kxx ; make clean)
 	(cd Ti ; make clean)
@@ -69,8 +66,7 @@ distclean :
 #	(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
 
-
-configure :
+configure:
 	./make-links
 	(cd ../bin ; ./configure2 )
 	(cd kxx ; make configure )
@@ -78,6 +74,3 @@ configure :
 	(cd pari ; ./Configure --prefix=../../../OpenXM)
 	(cd asir2000; ./configure)
 	(cd ox_math; ./configure)
-
-
-