===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.86
retrieving revision 1.94
diff -u -p -r1.86 -r1.94
--- OpenXM/src/Makefile	2000/03/08 04:51:37	1.86
+++ OpenXM/src/Makefile	2000/03/25 13:35:12	1.94
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.85 2000/03/06 14:58:00 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.93 2000/03/13 06:51:04 takayama Exp $
 
+OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
 OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
@@ -27,6 +28,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 +59,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 +134,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 +195,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,7 +244,11 @@ configure-links:
 	ln -f -s $(BINDIR) bin
 	ln -f -s $(OPENXM_CONTRIB)/gc gc
 	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
+	-mkdir ${OpenXM_HOME}/libexec 
 
+configure-oxtoolkit:
+	(cd ox_toolkit; ./make-configure)
+
 configure-oxmath:
 	(cd ox_math; ./make-configure)
 
@@ -257,10 +269,20 @@ all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
 post-install-correction: install
-	(cd ../bin ; rm -f asir ; ln -s ./ox_asir asir)
-	(cd ../lib/asir ; rm -f ox_asir ox_launch ox_plot help ; ln -s ./asir ox_asir ; ln -s ./asir ox_launch ; ln -s ./asir ox_plot ; ln -s ./help-eg help)
+# I think that we no longer need post-install-correction-for-asir
+# post-install-corrections-other
 	(cd ../rc ; make install.man)
 
-binary-dist : all-Copyright clean-rc all all-misc post-install-correction
+post-install-correction-for-asir:
+	(cd ../bin ; rm -f asir ox_asir ) 
+	cp ../lib/asir/asir ../bin/asir
+	(cd ../bin ; ln -s ./asir ox_asir)
+	(cd ../lib/asir ; rm -f asir ; ln -s ../../bin/asir asir)
+	(cd ../lib/asir ; rm -f ox_asir ox_launch ox_plot help ; ln -s ./asir ox_asir ; ln -s ./asir ox_launch ; ln -s ./asir ox_plot ; ln -s ./help-eg help)
+
+install-all-asir-lib:
+	(cd asir2000 ; make install-lib-small)
+
+binary-dist : all-Copyright clean-rc all all-misc post-install-correction install-all-asir-lib