===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.37
retrieving revision 1.47
diff -u -p -r1.37 -r1.47
--- OpenXM/src/Makefile	2000/01/08 17:56:57	1.37
+++ OpenXM/src/Makefile	2000/01/09 16:10:08	1.47
@@ -1,19 +1,19 @@
 ## Type in make configure and make all to build all
-## $OpenXM: OpenXM/src/Makefile,v 1.36 2000/01/08 17:17:49 maekawa Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.46 2000/01/09 15:59:44 maekawa Exp $
 
 all: configure all-kan96xx all-kxx all-tigers all-phc all-k097 \
      all-pari all-asir all-gnuplot all-openmath all-oxmath
 
-all-asir:
-	(cd asir2000 ; make ; make install ; make install2)
+all-asir: configure-asir
+	(cd asir2000 ; make all ; make install)
 
-all-gnuplot:
+all-gnuplot: configure-gnuplot
 	(cd gnuplot ; make all ; make install)
 
-all-kan96xx:
-	(cd kan96xx ; make all ; make install2)
+all-kan96xx: configure-kan96xx
+	(cd kan96xx ; make all)
 
-all-kxx:
+all-kxx: configure-kxx
 	(cd kxx ; make all ; make install2)
 
 all-k097:
@@ -27,7 +27,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 \
@@ -46,43 +46,55 @@ all-tigers:
 
 install: install-pari
 
+install-kan96xx: all-kan96xx
+	(cd kan96xx ; make install2)
+
 install-pari: all-pari
-	(cd pari ; make install ; ranlib ../../../OpenXM/lib/libpari.a)
+	(cd pari ; make install)
 
 clean:
 	(cd kan96xx ; make clean)
 	(cd kxx ; make clean)
 	(cd tigers ; make clean)
 	(cd gnuplot ; make clean)
+	(cd pari ; 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
+	/bin/rm -rf bin/sm1 bin/ox bin/oxlog bin/ox_sm1 bin/k0 bin/oxweave bin/fep.linux bin/lin_phcv2p
 
-distclean:
-	(cd kan96xx ; make distclean)
-	(cd kxx ; make clean)
-	(cd tigers ; make clean)
+distclean: clean
+	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
-	(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 kan96xx ; make distclean)
+	(cd pari ; make distclean)
+	(cd phc ; make distclean)
+	(cd tigers ; make distclean)
 
-configure: configure-links configure-asir
+configure: configure-links configure-asir configure-bin configure-gnuplot \
+	   configure-kan96xx configure-kxx configure-oxmath configure-pari
+
+configure-asir: install-pari
+	(cd asir2000; make configure)
+
+configure-bin:
 	(cd ../bin ; ./configure2)
-	(cd kxx ; make configure)
-	(cd kan96xx ; make configure)
+
+configure-gnuplot:
 	(cd gnuplot ; make configure)
-	(cd ox_math; ./configure)
 
-configure-asir: install-pari
-	(cd asir2000; ./configure ; xmkmf -a ; make depend)
+configure-kan96xx:
+	(cd kan96xx ; make configure)
 
+configure-kxx: install-kan96xx
+	(cd kxx ; make configure)
+
 configure-links:
 	./make-links
+
+configure-oxmath:
+	(cd ox_math; ./configure)
 
 configure-pari:
 	(cd pari ; make configure)