===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.54
retrieving revision 1.59
diff -u -p -r1.54 -r1.59
--- OpenXM/src/Makefile	2000/01/09 19:34:55	1.54
+++ OpenXM/src/Makefile	2000/01/16 22:20:31	1.59
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.53 2000/01/09 19:32:13 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.58 2000/01/16 01:35:49 takayama Exp $
 
+OPENXM_CONTRIB=../../OpenXM_contrib
 LIBDIR=../lib
 BINDIR=../bin
 
@@ -48,7 +49,7 @@ all-tigers:
 
 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-contrib
 
 install-asir: all-asir
 	(cd asir2000 ; make install)
@@ -60,10 +61,10 @@ 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
 
@@ -78,6 +79,9 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
+install-asir-contrib: install-asir
+	(cd asir-contrib ; make install)
+
 clean:
 	(cd asir2000 ; make clean)
 	(cd gnuplot ; make clean)
@@ -88,16 +92,17 @@ clean:
 	(cd pari ; make clean)
 	(cd phc ; make clean)
 	(cd tigers ; 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 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
 
@@ -109,7 +114,7 @@ configure-asir:
 	(cd asir2000; make configure)
 
 configure-bin:
-	(cd $(BINDIR) ; ./configure2)
+	(cd $(BINDIR) ; make configure)
 
 configure-gnuplot:
 	(cd gnuplot ; make configure)
@@ -128,8 +133,8 @@ configure-links:
 	(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)