===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.96
retrieving revision 1.102
diff -u -p -r1.96 -r1.102
--- OpenXM/src/Makefile	2000/09/17 03:12:09	1.96
+++ OpenXM/src/Makefile	2000/12/21 08:20:09	1.102
@@ -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.101 2000/12/21 07:29:39 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. " ; \
@@ -69,6 +72,7 @@ all-phc:
 all-tigers:
 	(cd tigers ; make all)
 
+
 all-misc :
 	(cd ../rc ; make repl)
 	(cd ../doc ; make all-install)
@@ -105,7 +109,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 +131,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. " ; \
@@ -156,6 +163,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)
@@ -191,11 +199,29 @@ 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: 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 \
@@ -216,30 +242,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
-	-mkdir ${OpenXM_HOME}/libexec 
+	-@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-oxtoolkit:
+configure-oxtoolkit: configure-include
 	(cd ox_toolkit; ./make-configure)
 
-configure-oxmath:
+configure-oxc: configure-include
+	(cd oxc; ./make-configure)
+
+configure-oxmath: configure-include
 	(cd ox_math; ./make-configure)
 
 configure-pari:
@@ -276,4 +308,12 @@ install-all-asir-lib:
 
 binary-dist : all-Copyright clean-rc all all-misc post-install-correction install-all-asir-lib
 
+##  Sub binary packages
+##  1: asir: asir only.   target:  all-asir install-asir
 
+##  2: k0-ox: k0 and sm1 with  OpenXM.  target: all-k0-ox install-k0-ox
+configure-all-k0-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