===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.33
diff -u -p -r1.1.1.1 -r1.33
--- OpenXM/src/Makefile	1999/10/08 02:12:01	1.1.1.1
+++ OpenXM/src/Makefile	2000/01/07 20:18:00	1.33
@@ -1,37 +1,78 @@
-all : all1 all2 all3
+## Type in make configure and make all to build all
+## $OpenXM: OpenXM/src/Makefile,v 1.32 2000/01/07 19:47:51 maekawa Exp $
 
-all1 :
-	(cd kan96xx ; make all )
-	(cd kan96xx ; make install-openXM-bin)
-	(cd kxx ; make all)
-	(cd kxx ; make install)
-all2 :
-	(cd gnuplot-diff ; make all)
-	(cd Ti ; make all )
-	(cd phc ; make all )
-all3 :
-	(cd k097 ; make all ; cp k0 ../../bin)
+all: all-kan96xx all-kxx all-tigers all-phc all-k097 \
+     all-pari all-asir all-gnuplot all-openmath all-oxmath
 
-clean :
+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) ; \
+	else \
+		echo -n "Warning: javac (java compiler) is not found " ; \
+		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)
+
+all-phc:
+	(cd phc ; make all ; make install)
+
+all-tigers:
+	(cd Ti ; make all ; make install)
+
+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 ; make clean )
+	(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
 
-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
-
-
+configure:
+	./make-links
+	(cd ../bin ; ./configure2 )
+	(cd kxx ; make configure )
+	(cd kan96xx ; make configure )
+	(cd pari ; ./Configure --prefix=../../../OpenXM)
+	(cd asir2000; ./configure)
+	(cd ox_math; ./configure)