=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.136 retrieving revision 1.142 diff -u -p -r1.136 -r1.142 --- OpenXM/src/Makefile 2004/02/26 23:29:46 1.136 +++ OpenXM/src/Makefile 2004/06/30 22:14:06 1.142 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM/src/Makefile,v 1.135 2004/02/23 11:38:36 takayama Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.141 2004/06/30 12:13:05 takayama Exp $ OpenXM_HOME=.. OpenXM_contrib=../../OpenXM_contrib @@ -74,7 +74,7 @@ all-misc : install-util all-rc: (cd ../rc ; make ) -all-util: +all-util: configure-util (cd util ; make all) install: install-oxtags install-util install-asir install-gnuplot \ @@ -153,11 +153,11 @@ install-asir-contrib-asir-progs: install-asir install- (cd asir-contrib ; make install) -install-asir-doc: install-asir +install-asir-doc: configure-asir-doc install-asir -(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) @@ -214,17 +214,23 @@ distclean: clean $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \ $(LIBDIR)/k097 $(LIBDIR)/sm1 -configure: configure-asir \ +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-gmp: +configure-util: + (cd util; ./make-configure) + +configure-gmp: install-util (cd gmp; make configure) configure-asir: (cd asir2000 ; make configure) +configure-asir-doc: + -(cd asir-doc ; ./make-configure) + configure-gnuplot: -(cd gnuplot ; make configure) @@ -232,7 +238,7 @@ configure-k097: (cd k097 ; ./make-configure) configure-kan96xx: - (cd kan96xx ; make configure) + (cd kan96xx ; ./make-configure) configure-kxx: ( cd kxx ; ./make-configure)