===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.104
retrieving revision 1.116
diff -u -p -r1.104 -r1.116
--- OpenXM/src/Makefile 2000/12/21 09:25:23 1.104
+++ OpenXM/src/Makefile 2003/03/06 10:36:03 1.116
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.103 2000/12/21 09:13:05 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.115 2003/02/02 01:36:31 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-kxx
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc configure-util
(cd ox_toolkit; make)
all-oxc: configure-oxc install-oxtoolkit
@@ -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,13 +87,13 @@ 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 ; \
fi
@touch gc/.gc_installed
@@ -124,7 +127,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 +140,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. " ; \
@@ -160,11 +163,14 @@ install-asir-contrib: install-asir install-kxx
(cd asir-contrib ; make install)
install-asir-doc: install-asir
- (cd asir-doc ; make install)
+ -(cd asir-doc ; make install)
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,9 +192,10 @@ clean:
(cd tigers ; make clean)
(cd asir-doc ; make clean)
(cd asir-contrib ; make clean)
+ -(cd ${OPENXM_CONTRIB2}/fep ; make clean)
distclean: clean
- (cd $(BINDIR) ; make distclean)
+ (cd uuencoded ; make distclean)
-(cd $(OPENXM_CONTRIB)/gmp ; make distclean)
(cd $(OPENXM_CONTRIB)/gc ; make clean ; /bin/rm -f *.a)
(cd asir2000 ; make distclean)
@@ -205,11 +212,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 +247,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 \
@@ -245,7 +256,7 @@ configure-asir:
fi
configure-bin:
- (cd $(BINDIR) ; make configure)
+ (cd uuencoded ; make configure)
configure-gnuplot:
-(cd gnuplot ; make configure)
@@ -255,10 +266,10 @@ configure-k097: configure-links
configure-kan96xx: configure-links
(cd kan96xx ; make configure)
-configure-kxx:
+configure-kxx: configure-util
( cd kxx ; ./make-configure)
-configure-links:
+configure-links: configure-directory
-@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) ; \
@@ -271,13 +282,18 @@ configure-links:
touch ./.configure-links-done ;\
fi
+configure-directory:
+ -@if [ ! -d ../bin ] ; then \
+ mkdir ../bin ; \
+ fi
+
configure-oxtoolkit: configure-include
(cd ox_toolkit; ./make-configure)
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:
@@ -308,6 +324,7 @@ post-install-correction-for-asir:
(cd ../bin ; ln -s ./asir ox_asir)
(cd ../lib/asir ; rm -f asir ; ln -s ../../bin/asir asir)
(cd ../lib/asir ; rm -f ox_asir ox_launch ox_plot help ; ln -s ./asir ox_asir ; ln -s ./asir ox_launch ; ln -s ./asir ox_plot ; ln -s ./help-eg help)
+ -(cd asir-doc ; make install-man-pages)
install-all-asir-lib:
(cd asir2000 ; make install-lib-small)
@@ -319,15 +336,20 @@ install-for-debug:
(cd kan96xx; make install-for-debug)
(cd kxx; make install-for-debug)
(cd k097 ; make install-for-debug)
+ (cd ../bin ; rm -f asir ; ln -s ../../OpenXM_contrib2/asir2000/asir .)
## Sub binary packages
-## 1: asir: asir only. target: all-asir install-asir
+## 1: asir: asir only. target: all-asir install-asir install-asir-doc
-## 2: k0-ox: k0 and sm1 with ox_asir. target: all-k0-ox install-k0-ox
-configure-all-k0-ox : configure-links configure-include configure-asir \
+## 2: kan-ox: k0 and sm1 with ox_asir. target: all-kan-ox install-kan-ox
+configure-all-kan-ox : configure-links configure-include configure-asir \
configure-kan96xx configure-kxx configure-k097 \
configure-oxc
-all-k0-ox: configure-all-k0-ox all-asir all-kan96xx all-kxx all-k097 all-oxc
-install-k0-ox: all-k0-ox install-asir install-kan96xx install-kxx \
- install-k097 install-oxc
+all-kan-ox: configure-all-kan-ox all-asir all-kan96xx all-kxx all-k097 all-oxc
+install-kan-ox: all-kan-ox install-asir install-kan96xx install-kxx \
+ install-k097 install-oxc install-asir-doc \
+ post-install-kan-ox
+post-install-kan-ox:
+ (cd ../bin ; /bin/rm -f ox_asir; ln -s ./asir ox_asir)
+