===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.16
retrieving revision 1.24
diff -u -p -r1.16 -r1.24
--- OpenXM/src/Makefile	1999/12/04 02:20:08	1.16
+++ OpenXM/src/Makefile	2000/01/07 19:21:39	1.24
@@ -1,25 +1,32 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.15 1999/12/03 12:56:39 takayama Exp $
-all : all1 all3  all4 all-pari all-asir all2 all5 all6
+## $OpenXM: OpenXM/src/Makefile,v 1.23 2000/01/07 19:18:13 maekawa Exp $
+all : all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all-openmath all6
 
 all1 :
 	(cd kan96xx ; make all )
 	(cd kan96xx ; make install2)
 	(cd kxx ; make all)
 	(cd kxx ; make install2)
-all2 :
-	(cd gnuplot-diff ; make all)
-	(cd gnuplot-diff ; make install)
-all3:
+
+all-gnuplot:
+	(cd gnuplot ; make all ; make install)
+
+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-phc:
+	(cd phc ; make all ; make install)
+
+all-tigers:
 	(cd Ti ; make all ; make install)
-	(cd phc ; make all ; make install )
+
 all4 :
 	(cd k097 ; make all ; make install)
-all5 :
-	if test -d /usr/local/jdk1.1.7 ; \
-	then \
-	(cd OpenMath ; make ) ; \
-	fi 
 
 all6 :
 	if test -d /usr/local/mathematica ; \
@@ -38,8 +45,7 @@ clean :
 	(cd kan96xx ; make clean )
 	(cd kxx ; make clean)
 	(cd Ti ; make clean)
-	(cd gnuplot-diff ; make clean )
-	(cd gnuplot ; make clean)
+	(cd gnuplot ; make clean )
 	(cd phc ; make clean )
 	(cd k097 ; make clean )
 	(cd asir2000 ; make clean )
@@ -51,8 +57,7 @@ distclean :
 	(cd kan96xx ; make distclean )
 	(cd kxx ; make clean)
 	(cd Ti ; make clean)
-	(cd gnuplot-diff ; make clean )
-	(cd gnuplot ; make distclean )
+	(cd gnuplot ; make clean )
 	(cd phc ; make clean )
 	(cd k097 ; make clean )
 	(cd asir2000 ; make clean )