===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.21
retrieving revision 1.31
diff -u -p -r1.21 -r1.31
--- OpenXM/src/Makefile	2000/01/07 18:46:19	1.21
+++ OpenXM/src/Makefile	2000/01/07 19:45:25	1.31
@@ -1,42 +1,49 @@
 ## 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.30 2000/01/07 19:40:30 maekawa Exp $
+all: all1 all-tigers all-phc all-k097 all-pari all-asir all-gnuplot all-openmath all-oxmath
 
-all1 :
+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)
 
-all3:
-	(cd Ti ; make all ; make install)
-	(cd phc ; make all ; make install )
-all4 :
+all-k097:
 	(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
- 
 
-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)
+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)
 
-clean :
+all-phc:
+	(cd phc ; make all ; make install)
+
+all-tigers:
+	(cd Ti ; make all ; make install)
+
+clean:
 	/bin/rm -rf ../*~  *~
 	(cd kan96xx ; make clean )
 	(cd kxx ; make clean)
@@ -48,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)
@@ -60,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 )
@@ -69,6 +74,3 @@ configure :
 	(cd pari ; ./Configure --prefix=../../../OpenXM)
 	(cd asir2000; ./configure)
 	(cd ox_math; ./configure)
-
-
-