===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.85
retrieving revision 1.101
diff -u -p -r1.85 -r1.101
--- OpenXM/src/Makefile	2000/03/06 14:58:00	1.85
+++ OpenXM/src/Makefile	2000/12/21 07:29:39	1.101
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.84 2000/03/06 04:30:39 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.100 2000/12/20 11:12:52 takayama Exp $
 
+OpenXM_HOME=../../OpenXM
 OPENXM_CONTRIB=../../OpenXM_contrib
 OPENXM_CONTRIB2=../../OpenXM_contrib2
 LIBDIR=../lib
@@ -18,15 +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) ; \
@@ -36,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)
@@ -55,8 +55,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. " ; \
@@ -95,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
 
@@ -111,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)
@@ -130,9 +127,14 @@ 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-oxc: all-oxc
+	(cd oxc; make install)
+
+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. " ; \
@@ -160,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)
@@ -189,21 +192,41 @@ 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-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:
@@ -218,26 +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
+	-@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-oxmath:
+configure-oxtoolkit: configure-include
+	(cd ox_toolkit; ./make-configure)
+
+configure-oxc: configure-include
+	(cd oxc; ./make-configure)
+
+configure-oxmath: configure-include
 	(cd ox_math; ./make-configure)
 
 configure-pari:
@@ -247,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)
 
@@ -257,10 +291,20 @@ all-Copyright :
 	(cd $(COPYRIGHTDIR) ; make copy-copyright )
 
 post-install-correction: install
-	(cd ../bin ; rm -f asir ; ln -s ./ox_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)
+# I think that we no longer need post-install-correction-for-asir
+# post-install-corrections-other
 	(cd ../rc ; make install.man)
 
-binary-dist : all-Copyright clean-rc all all-misc post-install-correction
+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