=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.36 retrieving revision 1.37 diff -u -p -r1.36 -r1.37 --- OpenXM/src/Makefile 2000/01/08 17:17:49 1.36 +++ OpenXM/src/Makefile 2000/01/08 17:56:57 1.37 @@ -1,5 +1,5 @@ ## Type in make configure and make all to build all -## $OpenXM: OpenXM/src/Makefile,v 1.35 2000/01/08 16:38:32 maekawa Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.36 2000/01/08 17:17:49 maekawa Exp $ all: configure all-kan96xx all-kxx all-tigers all-phc all-k097 \ all-pari all-asir all-gnuplot all-openmath all-oxmath @@ -35,9 +35,8 @@ all-oxmath: echo "ox_math will not be compiled." ; \ fi -all-pari: - (cd pari ; make install) - (cd pari ; ranlib ../../../OpenXM/lib/libpari.a) +all-pari: configure-pari + (cd pari ; make all) all-phc: (cd phc ; make all ; make install) @@ -45,6 +44,11 @@ all-phc: all-tigers: (cd tigers ; make all ; make install) +install: install-pari + +install-pari: all-pari + (cd pari ; make install ; ranlib ../../../OpenXM/lib/libpari.a) + clean: (cd kan96xx ; make clean) (cd kxx ; make clean) @@ -67,12 +71,18 @@ distclean: # (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 -configure: - ./make-links +configure: configure-links configure-asir (cd ../bin ; ./configure2) (cd kxx ; make configure) (cd kan96xx ; make configure) (cd gnuplot ; make configure) - (cd pari ; make configure) - (cd asir2000; ./configure ; xmkmf -a ; make depend) (cd ox_math; ./configure) + +configure-asir: install-pari + (cd asir2000; ./configure ; xmkmf -a ; make depend) + +configure-links: + ./make-links + +configure-pari: + (cd pari ; make configure)