=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.29 retrieving revision 1.31 diff -u -p -r1.29 -r1.31 --- OpenXM/src/Makefile 2000/01/07 19:38:49 1.29 +++ OpenXM/src/Makefile 2000/01/07 19:45:25 1.31 @@ -1,6 +1,6 @@ ## Type in make configure and make all to build all -## $OpenXM: OpenXM/src/Makefile,v 1.28 2000/01/07 19:36:51 maekawa Exp $ -all: all1 all-tigers all-phc all4 all-pari all-asir all-gnuplot all-openmath all-oxmath +## $OpenXM: OpenXM/src/Makefile,v 1.30 2000/01/07 19:40:30 maekawa Exp $ +all: all1 all-tigers all-phc all-k097 all-pari all-asir all-gnuplot all-openmath all-oxmath all1: (cd kan96xx ; make all ) @@ -14,13 +14,8 @@ all-asir: all-gnuplot: (cd gnuplot ; make all ; make install) -all-oxmath: - @if test -d /usr/local/mathematica ; then \ - (cd ox_math ; make) ; \ - else \ - echo -n "Warning: Mathematica is not found. " ; \ - echo "ox_math will not be compiled." ; \ - fi +all-k097: + (cd k097 ; make all ; make install) all-openmath: @if ../misc/which.pl -s javac ; then \ @@ -30,6 +25,14 @@ all-openmath: echo "in your search path. OpenMath will not be compiled." ; \ fi +all-oxmath: + @if test -d /usr/local/mathematica ; then \ + (cd ox_math ; make) ; \ + else \ + echo -n "Warning: Mathematica is not found. " ; \ + 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) @@ -39,9 +42,6 @@ all-phc: all-tigers: (cd Ti ; make all ; make install) - -all4: - (cd k097 ; make all ; make install) clean: /bin/rm -rf ../*~ *~