===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.78
retrieving revision 1.97
diff -u -p -r1.78 -r1.97
--- OpenXM/src/Makefile	2000/02/01 10:12:47	1.78
+++ OpenXM/src/Makefile	2000/11/17 04:47:20	1.97
@@ -1,16 +1,36 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.77 2000/02/01 09:59:42 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.96 2000/09/17 03:12:09 takayama Exp $
 
+OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
+OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
 BINDIR=../bin
 RCDIR=../rc
 COPYRIGHTDIR=../Copyright
 
-all: configure all-asir all-gnuplot all-k097 all-kan96xx all-kxx \
-     all-pari all-phc all-openmath all-oxmath all-tigers
+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-gc: 
+	@if test ! -f gc/.gc_make_done ; \
+	then \
+		(cd gc ; make all) ; \
+	fi 
+	@touch gc/.gc_make_done
+
+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
+	(cd ox_toolkit; make)
+
 all-asir: configure-asir
-	(cd asir2000 ; make all)
+	@if test -d $(OPENXM_CONTRIB2) ; then \
+		(cd asir2000 ; make all) ; \
+	else \
+		echo -n "Warning: Asir source is not found. " ; \
+		echo "asir will not be compiled." ; \
+	fi
 
 all-gnuplot: configure-gnuplot
 	(cd gnuplot ; make all)
@@ -18,7 +38,7 @@ all-gnuplot: configure-gnuplot
 all-k097: configure-k097 all-kan96xx
 	(cd k097 ; make all)
 
-all-kan96xx: configure-kan96xx
+all-kan96xx: configure-kan96xx install-gc install-gmp
 	(cd kan96xx ; make all)
 
 all-kxx: configure-kxx all-kan96xx
@@ -32,8 +52,8 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath
-	@if test -d /usr/local/mathematica ; then \
+all-oxmath: configure-oxmath install-oxtoolkit
+	@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -56,10 +76,33 @@ all-misc :
 
 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-phc install-tigers install-asir-doc install-asir-contrib \
+	 install-misc
 
+
+install-gc : all-gc
+	-@if test ! -f gc/.gc_installed ; \
+	then \
+		mkdir ../lib ; \
+		cp gc/gc.a ../lib/libgc.a ; \
+	fi 
+	@touch gc/.gc_installed
+
+
+install-gmp : all-gmp
+	-@if test ! -f gmp/.gmp_installed ; \
+	then \
+		(cd gmp; make install) ; \
+	fi 
+	@touch gmp/.gmp_installed
+
 install-asir: all-asir
-	(cd asir2000 ; make install)
+	@if test -d $(OPENXM_CONTRIB2) ; then \
+		(cd asir2000 ; make install) ; \
+	else \
+		echo -n "Warning: Asir source is not found. " ; \
+		echo "asir will not be installed." ; \
+	fi
 
 install-gnuplot: all-gnuplot
 	(cd gnuplot ; make install)
@@ -81,9 +124,11 @@ install-openmath: all-openmath
 		echo "in your search path. OpenMath will not be installed." ; \
 	fi
 
+install-oxtoolkit: all-oxtoolkit
+	(cd ox_toolkit; make install)
 
-install-oxmath: all-oxmath
-	@if test -d /usr/local/mathematica ; then \
+install-oxmath: all-oxmath install-kxx
+	@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make install) ; \
 	else \
 		echo -n "Warning: Mathematica is not found. " ; \
@@ -107,7 +152,14 @@ install-asir-contrib: install-asir install-kxx
 install-asir-doc: install-asir
 	(cd asir-doc ; make install)
 
+install-misc:
+	(cd ../rc ; make install.man)
+
 clean:
+	-rm $(OPENXM_CONTRIB)/gmp/.gmp_*
+	-rm $(OPENXM_CONTRIB)/gc/.gc_*
+	-(cd $(OPENXM_CONTRIB)/gmp ; make clean)
+	(cd $(OPENXM_CONTRIB)/gc ; make clean ; /bin/rm -f *.a)
 	(cd asir2000 ; make clean)
 	(cd gnuplot ; make clean)
 	(cd k097 ; make clean)
@@ -123,6 +175,8 @@ clean:
 
 distclean: clean
 	(cd $(BINDIR) ; make distclean)
+	-(cd $(OPENXM_CONTRIB)/gmp ; make distclean)
+	(cd $(OPENXM_CONTRIB)/gc ; make clean ; /bin/rm -f *.a)
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
@@ -131,17 +185,48 @@ distclean: clean
 	(cd pari ; make distclean)
 	(cd phc ; make distclean)
 	(cd tigers ; make distclean)
+	-(cd ox_toolkit ; make distclean)
+	-(cd ox_math ; make distclean)
 	rm -rf $(BINDIR)/d0 $(BINDIR)/k0 $(BINDIR)/ox $(BINDIR)/ox_sm1 \
 	       $(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-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 \
+	  echo "MESSAGE: gmp is already configured. (.gmp_configured) " ;  \
+	else \
+	  (cd gmp ; ./configure --prefix=`pwd`/../../OpenXM; touch .gmp_configured) ; \
+	fi 
+
 configure-asir:
-	(cd asir2000; make configure)
+	@if test -d $(OPENXM_CONTRIB2) ; then \
+		(cd asir2000 ; make configure) ; \
+	else \
+		echo -n "Warning: Asir source is not found. " ; \
+		echo "asir will not be compiled." ; \
+	fi
 
 configure-bin:
 	(cd $(BINDIR) ; make configure)
@@ -165,25 +250,46 @@ configure-links:
 	ln -f -s $(BINDIR) bin
 	ln -f -s $(OPENXM_CONTRIB)/gc gc
 	ln -f -s $(OPENXM_CONTRIB)/gmp gmp
+	-mkdir ${OpenXM_HOME}/libexec 
 
+configure-oxtoolkit:
+	(cd ox_toolkit; ./make-configure)
+
 configure-oxmath:
-	(cd ox_math; ./configure)
+	(cd ox_math; ./make-configure)
 
 configure-pari:
 	(cd pari ; make configure)
 
-generate-source-distribution : generate-source-distribution-kxx
+generate-source-distribution : generate-source-distribution-kxx \
+                               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)
+
 clean-rc :
 	(cd $(RCDIR) ; make clean )
 all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
-binary-dist : all-Copyright clean-rc all install all-misc 
-	(cd ../bin ; rm -f asir ; ln -s ./ox_asir asir)
+post-install-correction: install
+# I think that we no longer need post-install-correction-for-asir
+# post-install-corrections-other
+	(cd ../rc ; make install.man)
+
+post-install-correction-for-asir:
+	(cd ../bin ; rm -f asir ox_asir ) 
+	cp ../lib/asir/asir ../bin/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)
+
+install-all-asir-lib:
+	(cd asir2000 ; make install-lib-small)
+
+binary-dist : all-Copyright clean-rc all all-misc post-install-correction install-all-asir-lib