===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.68
retrieving revision 1.79
diff -u -p -r1.68 -r1.79
--- OpenXM/src/Makefile	2000/01/20 07:25:26	1.68
+++ OpenXM/src/Makefile	2000/02/08 12:03:39	1.79
@@ -1,9 +1,10 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.67 2000/01/19 12:05:59 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.78 2000/02/01 10:12:47 takayama Exp $
 
 OPENXM_CONTRIB=../../OpenXM_contrib
 LIBDIR=../lib
 BINDIR=../bin
 RCDIR=../rc
+COPYRIGHTDIR=../Copyright
 
 all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
      all-pari all-phc all-openmath all-oxmath all-tigers
@@ -14,13 +15,13 @@ all-asir: configure-asir
 all-gnuplot: configure-gnuplot
 	(cd gnuplot ; make all)
 
-all-k097: configure-k097
+all-k097: configure-k097 all-kan96xx
 	(cd k097 ; make all)
 
 all-kan96xx: configure-kan96xx
 	(cd kan96xx ; make all)
 
-all-kxx: configure-kxx
+all-kxx: configure-kxx all-kan96xx
 	(cd kxx ; make all)
 
 all-openmath:
@@ -50,7 +51,8 @@ all-tigers:
 
 all-misc :
 	(cd ../rc ; make repl)
-	(cd ../doc ; make all)
+	(cd ../doc ; make all-install)
+	(cd ../doc ; make all-spec)
 
 install: install-asir install-gnuplot install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
@@ -81,6 +83,14 @@ install-openmath: all-openmath
 
 
 install-oxmath: all-oxmath
+	@if test -d /usr/local/mathematica ; then \
+		(cd ox_math ; make install) ; \
+	else \
+		echo -n "Warning: Mathematica is not found. " ; \
+		echo "ox_math will not be installed." ; \
+	fi
+	-(cd ox_math/documents ; make install)
+	-(cd ox_math/lib ; make install)
 
 install-pari: all-pari
 	(cd pari ; make install)
@@ -91,7 +101,7 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
-install-asir-contrib: install-asir
+install-asir-contrib: install-asir install-kxx
 	(cd asir-contrib ; make install)
 
 install-asir-doc: install-asir
@@ -102,9 +112,9 @@ clean:
 	(cd gnuplot ; make clean)
 	(cd k097 ; make clean)
 	(cd kan96xx ; make clean)
-	(cd kxx ; make clean)
+	-(cd kxx ; make clean)
 	(cd OpenMath ; make clean)
-#	(cd ox_math ; make clean)
+	-(cd ox_math ; make clean)
 	(cd pari ; make clean)
 	(cd phc ; make clean)
 	(cd tigers ; make clean)
@@ -116,6 +126,7 @@ distclean: clean
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
+	-(cd kxx ; make distclean)
 	(cd OpenMath ; make distclean)
 	(cd pari ; make distclean)
 	(cd phc ; make distclean)
@@ -138,13 +149,13 @@ configure-bin:
 configure-gnuplot:
 	(cd gnuplot ; make configure)
 
-configure-k097: install-kan96xx
+configure-k097: 
 
 configure-kan96xx:
 	(cd kan96xx ; make configure)
 
-configure-kxx: install-kan96xx
-	(cd kxx ; make configure)
+configure-kxx: 
+	( cd kxx ; ./make-configure) 
 
 configure-links:
 	rm -f -r $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
@@ -161,8 +172,21 @@ configure-oxmath:
 configure-pari:
 	(cd pari ; make configure)
 
+generate-source-distribution : generate-source-distribution-kxx \
+                               generate-source-distribution-ox_toolkit
+
+generate-source-distribution-kxx :
+	(cd kxx ; rm -f .configure_done Makefile ; autoconf)
+generate-source-distribution-ox_toolkit :
+	(cd ox_toolkit ; rm -f Makefile ; autoconf)
+
 clean-rc :
 	(cd $(RCDIR) ; make clean )
+all-Copyright :
+	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
-dist : clean-rc all install all-misc
+binary-dist : all-Copyright clean-rc all install all-misc 
+	(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)
+