===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.33
retrieving revision 1.54
diff -u -p -r1.33 -r1.54
--- OpenXM/src/Makefile	2000/01/07 20:18:00	1.33
+++ OpenXM/src/Makefile	2000/01/09 19:34:55	1.54
@@ -1,24 +1,26 @@
-## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.32 2000/01/07 19:47:51 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.53 2000/01/09 19:32:13 maekawa Exp $
 
-all: all-kan96xx all-kxx all-tigers all-phc all-k097 \
-     all-pari all-asir all-gnuplot all-openmath all-oxmath
+LIBDIR=../lib
+BINDIR=../bin
 
-all-asir:
-	(cd asir2000 ; xmkmf -a ; make ; make install ; make install2)
+all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
+     all-pari all-phc all-openmath all-oxmath all-tigers
 
-all-gnuplot:
-	(cd gnuplot ; make all ; make install)
+all-asir: configure-asir
+	(cd asir2000 ; make all)
 
-all-kan96xx:
-	(cd kan96xx ; make all ; make install2)
+all-gnuplot: configure-gnuplot
+	(cd gnuplot ; make all)
 
-all-kxx:
-	(cd kxx ; make all ; make install2)
+all-k097: configure-k097
+	(cd k097 ; make all)
 
-all-k097:
-	(cd k097 ; make all ; make install)
+all-kan96xx: configure-kan96xx
+	(cd kan96xx ; make all)
 
+all-kxx: configure-kxx
+	(cd kxx ; make all)
+
 all-openmath:
 	@if ../misc/which.pl -s javac ; then \
 		(cd OpenMath ; make) ; \
@@ -27,7 +29,7 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath:
+all-oxmath: configure-oxmath
 	@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
@@ -35,44 +37,102 @@ all-oxmath:
 		echo "ox_math will not be compiled." ; \
 	fi
 
-all-pari:
-	(cd pari ; make install ; make install-lib-sta)
-	(cd pari ; ranlib ../../OpenXM/lib/libpari.a)
+all-pari: configure-pari
+	(cd pari ; make all)
 
 all-phc:
-	(cd phc ; make all ; make install)
+	(cd phc ; make all)
 
 all-tigers:
-	(cd Ti ; make all ; make install)
+	(cd tigers ; make all)
 
+install: install-asir install-gnuplot install-k097 install-kan96xx \
+	 install-kxx install-openmath install-oxmath install-pari \
+	 install-phc install-tigers
+
+install-asir: all-asir
+	(cd asir2000 ; make install)
+
+install-gnuplot: all-gnuplot
+	(cd gnuplot ; make install)
+
+install-k097: all-k097
+	(cd k097 ; make install)
+
+install-kan96xx: all-kan96xx
+	(cd kan96xx ; make install2)
+
+install-kxx: all-kxx
+	(cd kxx ; make install2)
+
+install-openmath: all-openmath
+
+install-oxmath: all-oxmath
+
+install-pari: all-pari
+	(cd pari ; make install)
+
+install-phc: all-phc
+	(cd phc ; make install)
+
+install-tigers: all-tigers
+	(cd tigers ; make install)
+
 clean:
-	/bin/rm -rf ../*~  *~
-	(cd kan96xx ; make clean )
+	(cd asir2000 ; make clean)
+	(cd gnuplot ; make clean)
+	(cd k097 ; make clean)
+	(cd kan96xx ; make clean)
 	(cd kxx ; make clean)
-	(cd Ti ; make clean)
-	(cd gnuplot ; make clean )
-	(cd phc ; make clean )
-	(cd k097 ; make clean )
-	(cd asir2000 ; make clean )
-#	(cd ox_math ; make clean )
-	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6 bin/tigers bin/k0 bin/oxweave bin/gp-2.0 bin/gphelp bin/fep.linux bin/lin_phcv2p
+#	(cd ox_math ; make clean)
+	(cd pari ; make clean)
+	(cd phc ; make clean)
+	(cd tigers ; make clean)
 
-distclean:
-	(cd kan96xx ; make distclean )
-	(cd kxx ; make clean)
-	(cd Ti ; make clean)
-	(cd gnuplot ; make clean )
-	(cd phc ; make clean )
-	(cd k097 ; make clean )
-	(cd asir2000 ; make clean )
-#	(cd ox_math ; make clean )
-	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/phc6 bin/tigers bin/k0 bin/oxweave bin/gp-2.0 bin/gphelp bin/fep.linux bin/lin_phcv2p
+distclean: clean
+	(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 \
+	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
+	       $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp
 
-configure:
-	./make-links
-	(cd ../bin ; ./configure2 )
-	(cd kxx ; make configure )
-	(cd kan96xx ; make configure )
-	(cd pari ; ./Configure --prefix=../../../OpenXM)
-	(cd asir2000; ./configure)
+configure: configure-links configure-bin configure-asir configure-gnuplot \
+	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
+	   configure-pari
+
+configure-asir:
+	(cd asir2000; make configure)
+
+configure-bin:
+	(cd $(BINDIR) ; ./configure2)
+
+configure-gnuplot:
+	(cd gnuplot ; make configure)
+
+configure-k097: install-kan96xx
+
+configure-kan96xx:
+	(cd kan96xx ; make configure)
+
+configure-kxx: install-kan96xx
+	(cd kxx ; make configure)
+
+configure-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)
+
+configure-pari:
+	(cd pari ; make configure)