===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.86
retrieving revision 1.90
diff -u -p -r1.86 -r1.90
--- OpenXM/src/Makefile	2000/03/08 04:51:37	1.86
+++ OpenXM/src/Makefile	2000/03/08 06:30:29	1.90
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.85 2000/03/06 14:58:00 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.89 2000/03/08 06:08:18 ohara Exp $
 
 OPENXM_CONTRIB=../../OpenXM_contrib
 OPENXM_CONTRIB2=../../OpenXM_contrib2
@@ -27,6 +27,9 @@ all-gmp: configure-gmp
 	 (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; \
 	fi
 
+all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx
+	(cd ox_toolkit; make)
+
 all-asir: configure-asir
 	@if test -d $(OPENXM_CONTRIB2) ; then \
 		(cd asir2000 ; make all) ; \
@@ -55,7 +58,7 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath
+all-oxmath: configure-oxmath install-oxtoolkit
 	@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make) ; \
 	else \
@@ -130,8 +133,10 @@ install-openmath: all-openmath
 		echo "in your search path. OpenMath will not be installed." ; \
 	fi
 
+install-oxtoolkit: all-oxtoolkit
+	(cd ox_toolkit; make install)
 
-install-oxmath: all-oxmath
+install-oxmath: all-oxmath install-kxx
 	@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make install) ; \
 	else \
@@ -189,6 +194,8 @@ distclean: clean
 	(cd pari ; make distclean)
 	(cd phc ; make distclean)
 	(cd tigers ; make distclean)
+	-(cd ox_toolkit ; make distclean)
+	-(cd ox_math ; 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
@@ -236,6 +243,9 @@ configure-links:
 	ln -f -s $(BINDIR) bin
 	ln -f -s $(OPENXM_CONTRIB)/gc gc
 	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
+
+configure-oxtoolkit:
+	(cd ox_toolkit; ./make-configure)
 
 configure-oxmath:
 	(cd ox_math; ./make-configure)