===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.128
retrieving revision 1.133
diff -u -p -r1.128 -r1.133
--- OpenXM/src/Makefile	2003/09/06 11:43:52	1.128
+++ OpenXM/src/Makefile	2003/11/27 12:10:18	1.133
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.127 2003/09/03 02:03:23 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.132 2003/09/14 01:19:55 takayama Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib=../../OpenXM_contrib
@@ -11,7 +11,7 @@ COPYRIGHTDIR=../Copyright
 all: all-util all-gc all-gmp all-asir all-gnuplot all-k097 all-kan96xx \
      all-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep
 
-all-gc: 
+all-gc: install-util 
 	(cd gc; make all)
 
 all-gmp: configure-gmp
@@ -20,7 +20,7 @@ all-gmp: configure-gmp
 all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util
 	(cd ox_toolkit; make)
 
-all-oxc: configure-oxc install-oxtoolkit
+all-oxc: configure-oxc install-oxtoolkit 
 	(cd oxc; make)
 
 all-asir: configure-asir install-pari
@@ -46,7 +46,7 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath install-oxtoolkit
+all-oxmath: configure-oxmath install-oxtoolkit install-gc
 	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
@@ -102,7 +102,7 @@ install-asir: all-asir
 install-gnuplot: all-gnuplot
 	-(cd gnuplot ; make install)
 
-install-k097:  install-kxx all-k097
+install-k097:  install-kxx all-k097 install-oxc
 	(cd k097 ; make install)
 
 install-kan96xx: all-kan96xx
@@ -172,8 +172,8 @@ clean:
 	-rm ./.configure-links-done
 	-rm ${OpenXM_contrib}/gmp/.gmp_*
 	-rm ${OpenXM_contrib}/gc/.gc_*
-	-(cd ${OpenXM_contrib}/gmp ; make clean)
-	-(cd ${OpenXM_contrib}/gc ; make clean ; /bin/rm -f *.a)
+	-(cd gmp ; make clean)
+	-(cd gc ; make clean ; /bin/rm -f *.a)
 	-(cd asir2000 ; make clean)
 	-(cd gnuplot ; make clean)
 	-(cd k097 ; make clean)
@@ -188,11 +188,14 @@ clean:
 	-(cd asir-contrib ; make clean)
 	-(cd ${OpenXM_contrib2}/fep ; make clean)
 	-(cd util ; make clean)
+	-(cd ox_toolkit ; make clean)
+	-(cd oxc ; make clean)
 
+
 distclean: clean
 	(cd uuencoded ; make distclean)
-	-(cd ${OpenXM_contrib}/gmp ; make distclean)
-	(cd ${OpenXM_contrib}/gc ; make clean ; /bin/rm -f *.a)
+	-(cd gmp ; make distclean)
+	-(cd gc ; make distclean ; /bin/rm -f *.a)
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
@@ -203,9 +206,10 @@ distclean: clean
 	(cd tigers ; make distclean)
 	-(cd ox_toolkit ; make distclean)
 	-(cd ox_math ; make distclean)
+	-(cd oxc ; 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
+	       $(LIBDIR)/k097 $(LIBDIR)/sm1 
 
 configure: configure-asir \
 	   configure-gnuplot \
@@ -237,7 +241,12 @@ configure-oxc: 
 	(cd oxc; ./make-configure)
 
 configure-oxmath:
-	(cd ox_math; ./make-configure)
+	-@if test -d /usr/local/mathematica ; then \
+		(cd ox_math; ./make-configure) ; \
+	else \
+		echo -n "Warning: Mathematica is not found. " ; \
+		echo "ox_math will not be compiled." ; \
+	fi
 
 configure-pari:
 	(cd pari ; make configure)