===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.87
retrieving revision 1.97
diff -u -p -r1.87 -r1.97
--- OpenXM/src/Makefile	2000/03/08 05:31:33	1.87
+++ OpenXM/src/Makefile	2000/11/17 04:47:20	1.97
@@ -1,5 +1,6 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.86 2000/03/08 04:51:37 ohara 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
@@ -18,16 +19,9 @@ 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
+all-oxtoolkit: configure-oxtoolkit install-gmp install-kxx
 	(cd ox_toolkit; make)
 
 all-asir: configure-asir
@@ -58,7 +52,7 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath
+all-oxmath: configure-oxmath install-oxtoolkit
 	@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make) ; \
 	else \
@@ -98,10 +92,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
 
@@ -136,7 +127,7 @@ install-openmath: all-openmath
 install-oxtoolkit: all-oxtoolkit
 	(cd ox_toolkit; make install)
 
-install-oxmath: all-oxmath
+install-oxmath: all-oxmath install-kxx
 	@if test -x /usr/local/bin/math ; then \
 		(cd ox_math ; make install) ; \
 	else \
@@ -194,21 +185,39 @@ 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:
+	@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(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:
@@ -241,6 +250,7 @@ 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)
@@ -255,7 +265,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)
 
@@ -265,10 +276,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