===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.52
retrieving revision 1.57
diff -u -p -r1.52 -r1.57
--- OpenXM/src/Makefile	2000/01/09 18:44:55	1.52
+++ OpenXM/src/Makefile	2000/01/15 22:19:06	1.57
@@ -1,9 +1,12 @@
-## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.51 2000/01/09 18:20:14 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.56 2000/01/09 20:19:40 maekawa Exp $
 
-all: configure all-kan96xx all-kxx all-tigers all-phc all-k097 \
-     all-pari all-asir all-gnuplot all-openmath all-oxmath
+OPENXM_CONTRIB=../../OpenXM_contrib
+LIBDIR=../lib
+BINDIR=../bin
 
+all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
+     all-pari all-phc all-openmath all-oxmath all-tigers
+
 all-asir: configure-asir
 	(cd asir2000 ; make all)
 
@@ -45,7 +48,8 @@ all-tigers:
 	(cd tigers ; make all)
 
 install: install-asir install-gnuplot install-k097 install-kan96xx \
-	 install-kxx install-pari install-phc install-tigers
+	 install-kxx install-openmath install-oxmath install-pari \
+	 install-phc install-tigers
 
 install-asir: all-asir
 	(cd asir2000 ; make install)
@@ -57,11 +61,15 @@ 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)
 
+install-openmath: all-openmath
+
+install-oxmath: all-oxmath
+
 install-pari: all-pari
 	(cd pari ; make install)
 
@@ -81,17 +89,20 @@ clean:
 	(cd pari ; make clean)
 	(cd phc ; make clean)
 	(cd tigers ; make clean)
-	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/k0 bin/oxweave bin/fep.linux bin/lin_phcv2p
 
 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)/k0 $(BINDIR)/ox $(BINDIR)/ox_sm1 \
+	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
+	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-configure: configure-links configure-asir configure-bin configure-gnuplot \
+configure: configure-links configure-bin configure-asir configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
 	   configure-pari
 
@@ -99,7 +110,7 @@ configure-asir:
 	(cd asir2000; make configure)
 
 configure-bin:
-	(cd ../bin ; ./configure2)
+	(cd $(BINDIR) ; make configure)
 
 configure-gnuplot:
 	(cd gnuplot ; make configure)
@@ -113,7 +124,13 @@ configure-kxx: install-kan96xx
 	(cd kxx ; make configure)
 
 configure-links:
-	./make-links
+	rm -f $(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
 
 configure-oxmath:
 	(cd ox_math; ./configure)