=================================================================== RCS file: /home/cvs/OpenXM/src/Makefile,v retrieving revision 1.96 retrieving revision 1.100 diff -u -p -r1.96 -r1.100 --- OpenXM/src/Makefile 2000/09/17 03:12:09 1.96 +++ OpenXM/src/Makefile 2000/12/20 11:12:52 1.100 @@ -1,4 +1,4 @@ -## $OpenXM: OpenXM/src/Makefile,v 1.95 2000/08/31 13:23:12 takayama Exp $ +## $OpenXM: OpenXM/src/Makefile,v 1.99 2000/12/16 05:58:34 takayama Exp $ OpenXM_HOME=../../OpenXM OPENXM_CONTRIB=../../OpenXM_contrib @@ -24,6 +24,9 @@ all-gmp: configure-gmp 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) ; \ @@ -33,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) @@ -53,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. " ; \ @@ -105,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) @@ -127,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. " ; \ @@ -191,11 +197,27 @@ 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: + @if test ! -d ../include ; \ + then \ + mkdir ../include ; \ + fi + @if test ! -d ../include/ox ; \ + then \ + mkdir ../include/ox ; \ + fi + @if test -d ../include/ox ; \ + then \ + cp ../doc/OpenXM-web/cmotag.h ../include/ox ; \ + cp ../doc/OpenXM-web/oxMessageTag.h ../include/ox ; \ + cp ../doc/OpenXM-web/smCommand.h ../include/ox ; \ + fi + configure-gmp: configure-links @if test -f gmp/.gmp_configured ; \ then \ @@ -216,7 +238,7 @@ configure-bin: (cd $(BINDIR) ; make configure) configure-gnuplot: - (cd gnuplot ; make configure) + -(cd gnuplot ; make configure) configure-k097: @@ -238,6 +260,9 @@ configure-links: configure-oxtoolkit: (cd ox_toolkit; ./make-configure) + +configure-oxc: + (cd oxc; ./make-configure) configure-oxmath: (cd ox_math; ./make-configure)