===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.3
retrieving revision 1.17
diff -u -p -r1.3 -r1.17
--- OpenXM/src/Makefile	1999/10/30 11:28:37	1.3
+++ OpenXM/src/Makefile	1999/12/11 12:57:03	1.17
@@ -1,47 +1,76 @@
 ## Type in make configure and make all to build all
-all : all1 all2 all3
+## $OpenXM: OpenXM/src/Makefile,v 1.16 1999/12/04 02:20:08 takayama Exp $
+all : all1 all3  all4 all-pari all-asir all2 all5 all6
 
 all1 :
 	(cd kan96xx ; make all )
-	(cd kan96xx ; make install-openXM-bin)
+	(cd kan96xx ; make install2)
 	(cd kxx ; make all)
-	(cd kxx ; make install)
+	(cd kxx ; make install2)
 all2 :
 	(cd gnuplot-diff ; make all)
-	(cd Ti ; make all )
-	(cd phc ; make all )
-all3 :
-	(cd k097 ; make all ; cp k0 ../../bin)
+	(cd gnuplot-diff ; make install)
+all3:
+	(cd Ti ; make all ; make install)
+	(cd phc ; make all ; make install )
+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 ../*~  *~
-	(cd kan96xx ; make cleana )
+	(cd kan96xx ; make clean )
 	(cd kxx ; make clean)
 	(cd Ti ; make clean)
-	/bin/rm -rf kan96.tgz kxx.tgz *~ ../*~
-	/bin/rm -rf k097.tgz
-#	(cd kan96xx ; make clean-binary )
-#	(cd kxx ; make clean-binary )
 	(cd gnuplot-diff ; make clean )
-	/bin/rm -rf ../bin/tigers
+	(cd gnuplot ; make clean)
 	(cd phc ; make clean )
-	(cd k097 ; make clean ; /bin/rm -rf ../../bin/k0)
-	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6
+	(cd k097 ; 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
 
+
+distclean :
+	(cd kan96xx ; make distclean )
+	(cd kxx ; make clean)
+	(cd Ti ; make clean)
+	(cd gnuplot-diff ; make clean )
+	(cd gnuplot ; make distclean )
+	(cd phc ; make clean )
+	(cd k097 ; 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
+
+
 configure :
-	ln -fs ../bin bin
-	ln -fs ./kan96xx SSkan
-	ln -fs ./kan96xx/gmp gmp
-	(cd ../lib ; ln -fs ../src/k097 k097 ; ln -fs ../src/kan96xx/Doc sm1)
+	./make-links
 	(cd ../bin ; ./configure2 )
+	(cd kxx ; make configure )
 	(cd kan96xx ; make configure )
-	(cd kxx ; ln -fs  ../SSkan/plugin/ox_kan.h ox_kan.h)
-	(cd ../lib/asir ; ./configure2 )
+	(cd pari ; ./Configure --prefix=../../../OpenXM)
+	(cd asir2000; ./configure)
+	(cd ox_math; ./configure)
 
-install-usr-local : 
-	ln -sf `pwd`/SSkan/Doc    /usr/local/lib/sm1
-	ln -sf `pwd`/../lib/asir  /usr/local/lib/asir
-	ln -sf `pwd`/../bin/sm1  /usr/local/bin/sm1
-	ln -sf `pwd`/../bin/fep  /usr/local/bin/fep