===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.54
retrieving revision 1.68
diff -u -p -r1.54 -r1.68
--- OpenXM/src/Makefile	2000/01/09 19:34:55	1.54
+++ OpenXM/src/Makefile	2000/01/20 07:25:26	1.68
@@ -1,7 +1,9 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.53 2000/01/09 19:32:13 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.67 2000/01/19 12:05:59 takayama Exp $
 
+OPENXM_CONTRIB=../../OpenXM_contrib
 LIBDIR=../lib
 BINDIR=../bin
+RCDIR=../rc
 
 all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
      all-pari all-phc all-openmath all-oxmath all-tigers
@@ -23,7 +25,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." ; \
@@ -46,9 +48,13 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
+all-misc :
+	(cd ../rc ; make repl)
+	(cd ../doc ; make all)
+
 install: install-asir install-gnuplot install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
-	 install-phc install-tigers
+	 install-phc install-tigers install-asir-doc install-asir-contrib
 
 install-asir: all-asir
 	(cd asir2000 ; make install)
@@ -60,13 +66,20 @@ install-k097: all-k097
 	(cd k097 ; make install)
 
 install-kan96xx: all-kan96xx
-	(cd kan96xx ; make install2)
+	(cd kan96xx ; make install)
 
 install-kxx: all-kxx
-	(cd kxx ; make install2)
+	(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
 
 install-pari: all-pari
@@ -78,30 +91,41 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
+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
+	(cd $(BINDIR) ; make distclean)
 	(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)
-	rm -rf $(BINDIR)/d0 $(BINDIR)/fep.linux $(BINDIR)/k0 \
-	       $(BINDIR)/lin_phcv2p $(BINDIR)/ox $(BINDIR)/ox_sm1 \
+	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
 
-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
 
@@ -109,7 +133,7 @@ configure-asir:
 	(cd asir2000; make configure)
 
 configure-bin:
-	(cd $(BINDIR) ; ./configure2)
+	(cd $(BINDIR) ; make configure)
 
 configure-gnuplot:
 	(cd gnuplot ; make configure)
@@ -123,16 +147,22 @@ 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
 	ln -f -s $(BINDIR) bin
-	ln -f -s $OPENXM_CONTRIB/gc gc
-	ln -f -s $OPENXM_CONTRIB/gmp gmp
+	ln -f -s $(OPENXM_CONTRIB)/gc gc
+	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
 
 configure-oxmath:
 	(cd ox_math; ./configure)
 
 configure-pari:
 	(cd pari ; make configure)
+
+clean-rc :
+	(cd $(RCDIR) ; make clean )
+
+dist : clean-rc all install all-misc
+