===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.58
diff -u -p -r1.1.1.1 -r1.58
--- OpenXM/src/Makefile	1999/10/08 02:12:01	1.1.1.1
+++ OpenXM/src/Makefile	2000/01/16 01:35:49	1.58
@@ -1,37 +1,139 @@
-all : all1 all2 all3
+## $OpenXM: OpenXM/src/Makefile,v 1.57 2000/01/15 22:19:06 takayama Exp $
 
-all1 :
-	(cd kan96xx ; make all )
-	(cd kan96xx ; make install-openXM-bin)
+OPENXM_CONTRIB=../../OpenXM_contrib
+LIBDIR=../lib
+BINDIR=../bin
+
+all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
+     all-pari all-phc all-openmath all-oxmath all-tigers
+
+all-asir: configure-asir
+	(cd asir2000 ; make all)
+
+all-gnuplot: configure-gnuplot
+	(cd gnuplot ; make all)
+
+all-k097: configure-k097
+	(cd k097 ; make all)
+
+all-kan96xx: configure-kan96xx
+	(cd kan96xx ; make all)
+
+all-kxx: configure-kxx
 	(cd kxx ; make all)
+
+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: configure-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: configure-pari
+	(cd pari ; make all)
+
+all-phc:
+	(cd phc ; make all)
+
+all-tigers:
+	(cd tigers ; make all)
+
+install: install-asir install-gnuplot install-k097 install-kan96xx \
+	 install-kxx install-openmath install-oxmath install-pari \
+	 install-phc install-tigers
+
+install-asir: all-asir
+	(cd asir2000 ; make install)
+
+install-gnuplot: all-gnuplot
+	(cd gnuplot ; make install)
+
+install-k097: all-k097
+	(cd k097 ; make install)
+
+install-kan96xx: all-kan96xx
+	(cd kan96xx ; make install)
+
+install-kxx: all-kxx
 	(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)
 
-clean :
-	/bin/rm -rf ../*~  *~
-	(cd kan96xx ; make cleana )
+install-openmath: all-openmath
+
+install-oxmath: all-oxmath
+
+install-pari: all-pari
+	(cd pari ; make install)
+
+install-phc: all-phc
+	(cd phc ; make install)
+
+install-tigers: all-tigers
+	(cd tigers ; make install)
+
+clean:
+	(cd asir2000 ; make clean)
+	(cd gnuplot ; make clean)
+	(cd k097 ; make clean)
+	(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 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 ox_math ; make clean)
+	(cd pari ; make clean)
+	(cd phc ; make clean)
+	(cd tigers ; make clean)
 
+distclean: clean
+	(cd $(BINDIR) ; make distclean)
+	(cd asir2000 ; make distclean)
+	(cd gnuplot ; make distclean)
+	(cd kan96xx ; make distclean)
+	(cd pari ; make distclean)
+	(cd phc ; make distclean)
+	(cd tigers ; make distclean)
+	rm -rf $(BINDIR)/d0 $(BINDIR)/k0 $(BINDIR)/ox $(BINDIR)/ox_sm1 \
+	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
+	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-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: configure-links configure-bin configure-asir configure-gnuplot \
+	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
+	   configure-pari
 
+configure-asir:
+	(cd asir2000; make configure)
 
+configure-bin:
+	(cd $(BINDIR) ; make configure)
+
+configure-gnuplot:
+	(cd gnuplot ; make configure)
+
+configure-k097: install-kan96xx
+
+configure-kan96xx:
+	(cd kan96xx ; make configure)
+
+configure-kxx: install-kan96xx
+	(cd kxx ; make configure)
+
+configure-links:
+	rm -f $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
+	(cd $(LIBDIR) ; ln -f -s ../src/k097 k097)
+	(cd $(LIBDIR) ; ln -f -s ../src/kan96xx/Doc sm1)
+	ln -f -s kan96xx SSkan
+	ln -f -s $(BINDIR) bin
+	ln -f -s $(OPENXM_CONTRIB)/gc gc
+	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
+
+configure-oxmath:
+	(cd ox_math; ./configure)
+
+configure-pari:
+	(cd pari ; make configure)