=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.138 retrieving revision 1.146 diff -u -p -r1.138 -r1.146 --- OpenXM/src/Makefile 2004/06/14 09:07:32 1.138 +++ OpenXM/src/Makefile 2004/12/07 15:26:41 1.146 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM/src/Makefile,v 1.137 2004/03/25 01:52:18 takayama Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.145 2004/07/27 07:12:25 ohara Exp $ OpenXM_HOME=.. OpenXM_contrib=../../OpenXM_contrib @@ -17,7 +17,7 @@ all-gc: install-util all-gmp: configure-gmp (cd gmp; make all) -all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util +all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util install-kan96xx (cd ox_toolkit; make) all-oxc: configure-oxc install-oxtoolkit @@ -144,7 +144,7 @@ install-phc: all-phc install-tigers: all-tigers (cd tigers ; make install) -install-asir-contrib: install-asir-contrib-asir-progs \ +install-asir-contrib: configure-asir-contrib install-asir-contrib-asir-progs \ install-asir-contrib-oxservers install-asir-contrib-oxservers: install-asir install-util \ install-k097 install-kxx install-openmath install-oxmath \ @@ -152,12 +152,11 @@ install-asir-contrib-oxservers: install-asir install-u install-asir-contrib-asir-progs: install-asir install-util (cd asir-contrib ; make install) - -install-asir-doc: install-asir +install-asir-doc: configure-asir-doc -(cd asir-doc ; make install) install-misc: - (cd ../rc ; make install.man) + (cd ../rc ; make install-man) install-fep: all-fep -(cd ${OpenXM_contrib2}/fep ; make PREFIX=../../OpenXM install) @@ -217,7 +216,7 @@ distclean: clean configure: configure-util configure-asir \ configure-gnuplot \ configure-k097 configure-kan96xx configure-kxx configure-oxmath \ - configure-pari configure-gmp + configure-pari configure-gmp configure-asir-doc configure-asir-contrib configure-util: (cd util; ./make-configure) @@ -228,6 +227,12 @@ configure-gmp: install-util configure-asir: (cd asir2000 ; make configure) +configure-asir-contrib: + -(cd asir-contrib ; ./make-configure) + +configure-asir-doc: + -(cd asir-doc ; ./make-configure) + configure-gnuplot: -(cd gnuplot ; make configure) @@ -235,7 +240,7 @@ configure-k097: (cd k097 ; ./make-configure) configure-kan96xx: - (cd kan96xx ; make configure) + (cd kan96xx ; ./make-configure) configure-kxx: ( cd kxx ; ./make-configure) @@ -254,7 +259,7 @@ configure-oxmath: echo "ox_math will not be compiled." ; \ fi -configure-pari: +configure-pari: install-util (cd pari ; make configure)