===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- OpenXM/src/Makefile	1999/11/23 01:38:32	1.13
+++ OpenXM/src/Makefile	2000/01/07 18:03:23	1.19
@@ -1,6 +1,6 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.12 1999/11/22 08:55:07 takayama Exp $
-all : all1 all3  all4 pari asir all2 all5 all6
+## $OpenXM: OpenXM/src/Makefile,v 1.18 2000/01/07 16:40:53 maekawa Exp $
+all : all1 all3  all4 all-pari all-asir all2 all5 all6
 
 all1 :
 	(cd kan96xx ; make all )
@@ -8,18 +8,21 @@ all1 :
 	(cd kxx ; make all)
 	(cd kxx ; make install2)
 all2 :
-	(cd gnuplot-diff ; make all)
-	(cd gnuplot-diff ; make install)
+	(cd gnuplot ; make all)
+	(cd gnuplot ; make install)
 all3:
 	(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 ; \
+	if ../misc/which.pl -s javac ; \
 	then \
 	(cd OpenMath ; make ) ; \
-	fi 
+	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 ; \
@@ -27,10 +30,10 @@ all6 :
 	(cd ox_math ; make ) ; \
 	fi 
 	   
-pari :
-	(cd pari-2.0.17.beta ; make install ; make install-lib-sta ; ranlib ../../lib/libpari.a)
-asir :
-	(cd asir99; xmkmf -a; make; make install ; make install2)
+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 :
@@ -38,11 +41,10 @@ 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 asir99 ; make clean )
+	(cd asir2000 ; make 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
 
@@ -51,11 +53,10 @@ 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 asir99 ; make clean )
+	(cd asir2000 ; make 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
 
@@ -65,8 +66,9 @@ configure :
 	(cd ../bin ; ./configure2 )
 	(cd kxx ; make configure )
 	(cd kan96xx ; make configure )
-	(cd pari-2.0.17.beta; ./Configure --prefix=../../..)
-	(cd asir99; ./configure)
+	(cd pari ; ./Configure --prefix=../../../OpenXM)
+	(cd asir2000; ./configure)
+	(cd ox_math; ./configure)