=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.94 retrieving revision 1.101 diff -u -p -r1.94 -r1.101 --- OpenXM/src/Makefile 2000/03/25 13:35:12 1.94 +++ OpenXM/src/Makefile 2000/12/21 07:29:39 1.101 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM/src/Makefile,v 1.93 2000/03/13 06:51:04 takayama Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.100 2000/12/20 11:12:52 takayama Exp $ OpenXM_HOME=../../OpenXM OPENXM_CONTRIB=../../OpenXM_contrib @@ -19,18 +19,14 @@ all-gc: @touch gc/.gc_make_done all-gmp: configure-gmp - if test -f /usr/lib/libgmp.a ; \ - then \ - echo "Using /usr/lib/libgmp.a" ; \ - /bin/rm -rf gmp/libgmp.a ; \ - ln -s /usr/lib/libgmp.a gmp/libgmp.a ; \ - else \ - (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; \ - fi + (if test ! -f .gmp_make_done ; then cd gmp ; make ; touch .gmp_make_done ; fi) ; all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx (cd ox_toolkit; make) +all-oxc: configure-oxc install-oxtoolkit + (cd oxc; make) + all-asir: configure-asir @if test -d $(OPENXM_CONTRIB2) ; then \ (cd asir2000 ; make all) ; \ @@ -40,7 +36,7 @@ all-asir: configure-asir fi all-gnuplot: configure-gnuplot - (cd gnuplot ; make all) + -(cd gnuplot ; make all) all-k097: configure-k097 all-kan96xx (cd k097 ; make all) @@ -60,7 +56,7 @@ all-openmath: fi all-oxmath: configure-oxmath install-oxtoolkit - @if test -x /usr/local/bin/math ; then \ + -@if test -x /usr/local/bin/math ; then \ (cd ox_math ; make) ; \ else \ echo -n "Warning: Mathematica is not found. " ; \ @@ -99,10 +95,7 @@ install-gc : all-gc install-gmp : all-gmp -@if test ! -f gmp/.gmp_installed ; \ then \ - mkdir ../lib ; \ - cp gmp/libgmp.a ../lib ; \ - mkdir ../include ; \ - cp gmp/gmp.h ../include ; \ + (cd gmp; make install) ; \ fi @touch gmp/.gmp_installed @@ -115,7 +108,7 @@ install-asir: all-asir fi install-gnuplot: all-gnuplot - (cd gnuplot ; make install) + -(cd gnuplot ; make install) install-k097: all-k097 (cd k097 ; make install) @@ -137,8 +130,11 @@ install-openmath: all-openmath install-oxtoolkit: all-oxtoolkit (cd ox_toolkit; make install) +install-oxc: all-oxc + (cd oxc; make install) + install-oxmath: all-oxmath install-kxx - @if test -x /usr/local/bin/math ; then \ + -@if test -x /usr/local/bin/math ; then \ (cd ox_math ; make install) ; \ else \ echo -n "Warning: Mathematica is not found. " ; \ @@ -166,6 +162,7 @@ install-misc: (cd ../rc ; make install.man) clean: + -rm ./.configure-links-done -rm $(OPENXM_CONTRIB)/gmp/.gmp_* -rm $(OPENXM_CONTRIB)/gc/.gc_* -(cd $(OPENXM_CONTRIB)/gmp ; make clean) @@ -201,17 +198,35 @@ distclean: clean $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \ $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp -configure: configure-links configure-bin configure-asir \ +configure: configure-links configure-include configure-bin configure-asir \ configure-gnuplot \ configure-k097 configure-kan96xx configure-kxx configure-oxmath \ configure-pari configure-gmp +configure-include: configure-include-make-dir ../include/ox/cmotag.h ../include/ox/oxMessageTag.h ../include/ox/smCommand.h + +configure-include-make-dir: + @if test ! -d ../include ; \ + then \ + mkdir ../include ; \ + fi + @if test ! -d ../include/ox ; \ + then \ + mkdir ../include/ox ; \ + fi +../include/ox/cmotag.h : ../doc/OpenXM-web/cmotag.h + cp ../doc/OpenXM-web/cmotag.h ../include/ox +../include/ox/oxMessageTag.h : ../doc/OpenXM-web/oxMessageTag.h + cp ../doc/OpenXM-web/oxMessageTag.h ../include/ox +../include/ox/smCommand.h : ../doc/OpenXM-web/smCommand.h + cp ../doc/OpenXM-web/smCommand.h ../include/ox + configure-gmp: configure-links @if test -f gmp/.gmp_configured ; \ then \ - echo "MESSAGE(kan96xx/Makefile): gmp is already configured. (.gmp_configured) " ; \ + echo "MESSAGE: gmp is already configured. (.gmp_configured) " ; \ else \ - (cd gmp ; ./configure ; touch .gmp_configured) ; \ + (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \ fi configure-asir: @@ -226,30 +241,36 @@ configure-bin: (cd $(BINDIR) ; make configure) configure-gnuplot: - (cd gnuplot ; make configure) + -(cd gnuplot ; make configure) -configure-k097: +configure-k097: configure-links -configure-kan96xx: +configure-kan96xx: configure-links (cd kan96xx ; make configure) configure-kxx: ( cd kxx ; ./make-configure) configure-links: - rm -f -r $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp - (cd $(LIBDIR) ; ln -f -s ../src/k097 k097) - (cd $(LIBDIR) ; ln -f -s ../src/kan96xx/Doc sm1) - ln -f -s kan96xx SSkan - ln -f -s $(BINDIR) bin - ln -f -s $(OPENXM_CONTRIB)/gc gc - ln -f -s $(OPENXM_CONTRIB)/gmp gmp - -mkdir ${OpenXM_HOME}/libexec + -@if [ ! -f ./.configure-links-done ] ; then \ + rm -f -r $(LIBDIR)/k097 $(LIBDIR)/sm1 SSkan bin gc gmp ; \ + (cd $(LIBDIR) ; ln -f -s ../src/k097 k097) ; \ + (cd $(LIBDIR) ; ln -f -s ../src/kan96xx/Doc sm1) ; \ + ln -f -s kan96xx SSkan ; \ + ln -f -s $(BINDIR) bin ; \ + ln -f -s $(OPENXM_CONTRIB)/gc gc ; \ + ln -f -s $(OPENXM_CONTRIB)/gmp gmp ; \ + mkdir ${OpenXM_HOME}/libexec ; \ + touch ./.configure-links-done ;\ + fi -configure-oxtoolkit: +configure-oxtoolkit: configure-include (cd ox_toolkit; ./make-configure) -configure-oxmath: +configure-oxc: configure-include + (cd oxc; ./make-configure) + +configure-oxmath: configure-include (cd ox_math; ./make-configure) configure-pari: @@ -259,7 +280,8 @@ generate-source-distribution : generate-source-distrib generate-source-distribution-ox_toolkit generate-source-distribution-kxx : - (cd kxx ; rm -f .configure_done Makefile ; autoconf) + (cd kxx ; rm -f .configure_done Makefile ) + generate-source-distribution-ox_toolkit : (cd ox_toolkit ; rm -f Makefile ; autoconf)