===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.59
retrieving revision 1.74
diff -u -p -r1.59 -r1.74
--- OpenXM/src/Makefile	2000/01/16 22:20:31	1.59
+++ OpenXM/src/Makefile	2000/01/25 02:52:23	1.74
@@ -1,8 +1,10 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.58 2000/01/16 01:35:49 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.73 2000/01/25 02:10:02 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
@@ -24,7 +26,7 @@ all-kxx: configure-kxx
 
 all-openmath:
 	@if ../misc/which.pl -s javac ; then \
-		(cd OpenMath ; make) ; \
+		(cd OpenMath ; make all) ; \
 	else \
 		echo -n "Warning: javac (java compiler) is not found " ; \
 		echo "in your search path. OpenMath will not be compiled." ; \
@@ -47,9 +49,14 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
+all-misc :
+	(cd ../rc ; make repl)
+	(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 \
-	 install-phc install-tigers install-asir-contrib
+	 install-phc install-tigers install-asir-doc install-asir-contrib
 
 install-asir: all-asir
 	(cd asir2000 ; make install)
@@ -67,8 +74,23 @@ install-kxx: all-kxx
 	(cd kxx ; make install)
 
 install-openmath: all-openmath
+	@if ../misc/which.pl -s javac ; then \
+		(cd OpenMath ; make install) ; \
+	else \
+		echo -n "Warning: javac (java compiler) is not found " ; \
+		echo "in your search path. OpenMath will not be installed." ; \
+	fi
 
+
 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)
@@ -82,16 +104,21 @@ install-tigers: all-tigers
 install-asir-contrib: install-asir
 	(cd asir-contrib ; make install)
 
+install-asir-doc: install-asir
+	(cd asir-doc ; make install)
+
 clean:
 	(cd asir2000 ; make clean)
 	(cd gnuplot ; make clean)
 	(cd k097 ; make clean)
 	(cd kan96xx ; make clean)
 	(cd kxx ; make clean)
+	(cd OpenMath ; make clean)
 #	(cd ox_math ; make clean)
 	(cd pari ; make clean)
 	(cd phc ; make clean)
 	(cd tigers ; make clean)
+	(cd asir-doc ; make clean)
 	(cd asir-contrib ; make clean)
 
 distclean: clean
@@ -99,6 +126,7 @@ distclean: clean
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
+	(cd OpenMath ; make distclean)
 	(cd pari ; make distclean)
 	(cd phc ; make distclean)
 	(cd tigers ; make distclean)
@@ -106,7 +134,8 @@ distclean: clean
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
 	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-configure: configure-links configure-bin configure-asir configure-gnuplot \
+configure: configure-links configure-bin configure-asir \
+	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
 	   configure-pari
 
@@ -128,7 +157,7 @@ configure-kxx: install-kan96xx
 	(cd kxx ; make configure)
 
 configure-links:
-	rm -f $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
+	rm -f -r $(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
@@ -141,3 +170,14 @@ configure-oxmath:
 
 configure-pari:
 	(cd pari ; make configure)
+
+clean-rc :
+	(cd $(RCDIR) ; make clean )
+all-Copyright :
+	(cd $(COPYRIGHTDIR) ; make copy-copyright )
+
+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)
+
+