=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.109 retrieving revision 1.120 diff -u -p -r1.109 -r1.120 --- OpenXM/src/Makefile 2001/12/18 04:24:04 1.109 +++ OpenXM/src/Makefile 2003/07/21 11:36:09 1.120 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM/src/Makefile,v 1.108 2001/08/21 00:47:17 takayama Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.119 2003/06/26 08:59:12 takayama Exp $ OpenXM_HOME=../../OpenXM OPENXM_CONTRIB=../../OpenXM_contrib @@ -9,7 +9,7 @@ RCDIR=../rc COPYRIGHTDIR=../Copyright all: configure all-gc all-gmp all-asir all-gnuplot all-k097 all-kan96xx \ - all-kxx all-pari all-phc all-openmath all-oxmath all-tigers + all-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep all-gc: @if test ! -f gc/.gc_make_done ; \ @@ -21,7 +21,7 @@ all-gc: all-gmp: configure-gmp (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; -all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-kxx +all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util (cd ox_toolkit; make) all-oxc: configure-oxc install-oxtoolkit @@ -38,7 +38,7 @@ all-asir: configure-asir all-gnuplot: configure-gnuplot -(cd gnuplot ; make all) -all-k097: configure-k097 all-kan96xx +all-k097: configure-k097 all-kan96xx all-kxx (cd k097 ; make all) all-kan96xx: configure-kan96xx install-gc install-gmp @@ -48,7 +48,7 @@ all-kxx: configure-kxx all-kan96xx (cd kxx ; make all) all-openmath: - @if ../misc/which.pl -s javac ; then \ + -@if ../misc/which.pl -s javac ; then \ (cd OpenMath ; make all) ; \ else \ echo -n "Warning: javac (java compiler) is not found " ; \ @@ -56,7 +56,7 @@ all-openmath: fi all-oxmath: configure-oxmath install-oxtoolkit - -@if test -x /usr/local/bin/math ; then \ + -@if test -d /usr/local/mathematica ; then \ (cd ox_math ; make) ; \ else \ echo -n "Warning: Mathematica is not found. " ; \ @@ -72,7 +72,10 @@ all-phc: all-tigers: (cd tigers ; make all) +all-fep: + -(cd ${OPENXM_CONTRIB2}/fep ; make all) + all-misc : (cd ../rc ; make repl) (cd ../doc ; make all-install) @@ -84,18 +87,31 @@ all-rc: install: install-asir install-gnuplot install-k097 install-kan96xx \ install-kxx install-openmath install-oxmath install-pari \ install-phc install-tigers install-asir-doc install-asir-contrib \ - install-misc + install-misc install-fep install-gc : all-gc -@if test ! -f gc/.gc_installed ; \ then \ - mkdir ../lib ; \ + if test ! -d ../lib ; then mkdir ../lib ; fi ; \ cp gc/gc.a ../lib/libgc.a ; \ + if test ! -d ../include/gc ; then mkdir -p ../include/gc ; fi ; \ + cp gc/include/gc.h gc/include/gc_cpp.h ../include/gc ; \ fi @touch gc/.gc_installed +install-asir-gc : configure-asir + @if test ! -f gc/.asir-gc_installed ; \ + then \ + if test ! -d ../lib ; then mkdir ../lib ; fi ; \ + (cd asir2000 ; make install-libasir-gc) ; \ + rm -f ../lib/libgc.a ; \ + ln -s ../lib/libasir-gc.a ../lib/libgc.a ; \ + echo "libasir-gc.a (modifed for asir) is installed as libgc.a instead of libgc.a" ; \ + touch gc/.asir-gc_installed ; \ + fi + install-gmp : all-gmp -@if test ! -f gmp/.gmp_installed ; \ then \ @@ -124,7 +140,7 @@ install-kxx: all-kxx (cd kxx ; make install) install-openmath: all-openmath - @if ../misc/which.pl -s javac ; then \ + -@if ../misc/which.pl -s javac ; then \ (cd OpenMath ; make install) ; \ else \ echo -n "Warning: javac (java compiler) is not found " ; \ @@ -137,8 +153,8 @@ install-oxtoolkit: all-oxtoolkit install-oxc: all-oxc (cd oxc; make install) -install-oxmath: all-oxmath install-kxx - -@if test -x /usr/local/bin/math ; then \ +install-oxmath: all-oxmath configure-util + -@if test -d /usr/local/mathematica ; then \ (cd ox_math ; make install) ; \ else \ echo -n "Warning: Mathematica is not found. " ; \ @@ -165,6 +181,9 @@ install-asir-doc: install-asir install-misc: (cd ../rc ; make install.man) +install-fep: all-fep + -(cd ${OPENXM_CONTRIB2}/fep ; make PREFIX=../../OpenXM install) + install-rc: all-rc (cd ../rc ; make install) @@ -186,6 +205,7 @@ clean: (cd tigers ; make clean) (cd asir-doc ; make clean) (cd asir-contrib ; make clean) + -(cd ${OPENXM_CONTRIB2}/fep ; make clean) distclean: clean (cd uuencoded ; make distclean) @@ -205,11 +225,15 @@ distclean: clean $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \ $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp -configure: configure-links configure-include configure-bin configure-asir \ +configure: configure-links configure-include configure-bin configure-util \ + configure-asir \ configure-gnuplot \ configure-k097 configure-kan96xx configure-kxx configure-oxmath \ configure-pari configure-gmp +configure-util: configure-directory + (cd util; make install) + configure-include: configure-include-make-dir ../include/ox/cmotag.h ../include/ox/oxMessageTag.h ../include/ox/smCommand.h configure-include-make-dir: @@ -236,7 +260,7 @@ configure-gmp: configure-links (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \ fi -configure-asir: +configure-asir: configure-directory configure-util @if test -d $(OPENXM_CONTRIB2) ; then \ (cd asir2000 ; make configure) ; \ else \ @@ -250,12 +274,12 @@ configure-bin: configure-gnuplot: -(cd gnuplot ; make configure) -configure-k097: configure-links +configure-k097: configure-links configure-util -configure-kan96xx: configure-links +configure-kan96xx: configure-links configure-util (cd kan96xx ; make configure) -configure-kxx: +configure-kxx: configure-util ( cd kxx ; ./make-configure) configure-links: configure-directory @@ -282,7 +306,7 @@ configure-oxtoolkit: configure-include configure-oxc: configure-include (cd oxc; ./make-configure) -configure-oxmath: configure-include +configure-oxmath: configure-include configure-directory (cd ox_math; ./make-configure) configure-pari: