=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.118 retrieving revision 1.121 diff -u -p -r1.118 -r1.121 --- OpenXM/src/Makefile 2003/06/02 20:26:58 1.118 +++ OpenXM/src/Makefile 2003/08/25 14:24:45 1.121 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM/src/Makefile,v 1.117 2003/05/17 08:24:56 takayama Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.120 2003/07/21 11:36:09 takayama Exp $ OpenXM_HOME=../../OpenXM OPENXM_CONTRIB=../../OpenXM_contrib @@ -19,7 +19,10 @@ all-gc: @touch gc/.gc_make_done all-gmp: configure-gmp - (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; + @if test ! -f gmp/.gmp_make_done ; then \ + (cd gmp ; make) ; \ + fi + @touch gmp/.gmp_make_done all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util (cd ox_toolkit; make) @@ -100,7 +103,18 @@ install-gc : all-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 \ @@ -263,9 +277,9 @@ 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-util