===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.129
retrieving revision 1.146
diff -u -p -r1.129 -r1.146
--- OpenXM/src/Makefile	2003/09/08 13:11:41	1.129
+++ OpenXM/src/Makefile	2004/12/07 15:26:41	1.146
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.128 2003/09/06 11:43:52 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.145 2004/07/27 07:12:25 ohara Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib=../../OpenXM_contrib
@@ -11,16 +11,16 @@ COPYRIGHTDIR=../Copyright
 all: all-util 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-fep
 
-all-gc: 
+all-gc: install-util 
 	(cd gc; make all)
 
 all-gmp: configure-gmp
 	(cd gmp; make all)
 
-all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util
+all-oxtoolkit: configure-oxtoolkit install-gmp install-gc install-util install-kan96xx
 	(cd ox_toolkit; make)
 
-all-oxc: configure-oxc install-oxtoolkit
+all-oxc: configure-oxc install-oxtoolkit 
 	(cd oxc; make)
 
 all-asir: configure-asir install-pari
@@ -46,7 +46,7 @@ all-openmath:
 		echo "in your search path. OpenMath will not be compiled." ; \
 	fi
 
-all-oxmath: configure-oxmath install-oxtoolkit
+all-oxmath: configure-oxmath install-oxtoolkit install-gc
 	-@if test -d /usr/local/mathematica ; then \
 		(cd ox_math ; make) ; \
 	else \
@@ -74,14 +74,14 @@ all-misc : install-util
 
 all-rc:
 	(cd ../rc ; make )
-all-util: 
+all-util: configure-util
 	(cd util ; make all)
 
 install: install-oxtags install-util 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-fep install-uuencoded 
+	 install-misc install-fep install-uuencoded  
 
 install-oxtags:
 	(cd ../doc/OpenXM-web ; make install-exec)
@@ -102,7 +102,7 @@ install-asir: all-asir
 install-gnuplot: all-gnuplot
 	-(cd gnuplot ; make install)
 
-install-k097:  install-kxx all-k097
+install-k097:  install-kxx all-k097 install-oxc
 	(cd k097 ; make install)
 
 install-kan96xx: all-kan96xx
@@ -144,7 +144,7 @@ install-phc: all-phc
 install-tigers: all-tigers
 	(cd tigers ; make install)
 
-install-asir-contrib: install-asir-contrib-asir-progs \
+install-asir-contrib: configure-asir-contrib install-asir-contrib-asir-progs \
                       install-asir-contrib-oxservers
 install-asir-contrib-oxservers: install-asir install-util \
                 install-k097 install-kxx install-openmath install-oxmath \
@@ -152,12 +152,11 @@ install-asir-contrib-oxservers: install-asir install-u
 install-asir-contrib-asir-progs: install-asir install-util
 	(cd asir-contrib ; make install)
 
-
-install-asir-doc: install-asir
+install-asir-doc: configure-asir-doc
 	-(cd asir-doc ; make install)
 
 install-misc:
-	(cd ../rc ; make install.man)
+	(cd ../rc ; make install-man)
 
 install-fep: all-fep
 	-(cd ${OpenXM_contrib2}/fep ; make PREFIX=../../OpenXM install)
@@ -168,12 +167,15 @@ install-rc: all-rc
 install-uuencoded:
 	(cd uuencoded ; make install)
 
+install-asir-port:
+	(cd asir-port ; make install)
+
 clean:
 	-rm ./.configure-links-done
 	-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 gmp ; make clean)
+	-(cd gc ; make clean ; /bin/rm -f *.a)
 	-(cd asir2000 ; make clean)
 	-(cd gnuplot ; make clean)
 	-(cd k097 ; make clean)
@@ -188,11 +190,14 @@ clean:
 	-(cd asir-contrib ; make clean)
 	-(cd ${OpenXM_contrib2}/fep ; make clean)
 	-(cd util ; make clean)
+	-(cd ox_toolkit ; make clean)
+	-(cd oxc ; make clean)
 
+
 distclean: clean
 	(cd uuencoded ; make distclean)
-	-(cd ${OpenXM_contrib}/gmp ; make distclean)
-	(cd ${OpenXM_contrib}/gc ; make clean ; /bin/rm -f *.a)
+	-(cd gmp ; make distclean)
+	-(cd gc ; make distclean ; /bin/rm -f *.a)
 	(cd asir2000 ; make distclean)
 	(cd gnuplot ; make distclean)
 	(cd kan96xx ; make distclean)
@@ -203,21 +208,31 @@ distclean: clean
 	(cd tigers ; make distclean)
 	-(cd ox_toolkit ; make distclean)
 	-(cd ox_math ; make distclean)
+	-(cd oxc ; 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
+	       $(LIBDIR)/k097 $(LIBDIR)/sm1 
 
-configure: configure-asir \
+configure: configure-util configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
-	   configure-pari configure-gmp
+	   configure-pari configure-gmp configure-asir-doc configure-asir-contrib
 
-configure-gmp: 
+configure-util:
+	(cd util; ./make-configure)
+
+configure-gmp: install-util
 	(cd gmp; make configure)
 
 configure-asir: 
 	(cd asir2000 ; make configure) 
 
+configure-asir-contrib: 
+	-(cd asir-contrib ; ./make-configure) 
+
+configure-asir-doc: 
+	-(cd asir-doc ; ./make-configure) 
+
 configure-gnuplot:
 	-(cd gnuplot ; make configure)
 
@@ -225,7 +240,7 @@ configure-k097:
 	(cd k097 ; ./make-configure)	
 
 configure-kan96xx:
-	(cd kan96xx ; make configure)
+	(cd kan96xx ; ./make-configure)
 
 configure-kxx: 
 	( cd kxx ; ./make-configure) 
@@ -244,7 +259,7 @@ configure-oxmath:
 		echo "ox_math will not be compiled." ; \
 	fi
 
-configure-pari:
+configure-pari: install-util
 	(cd pari ; make configure)
 
 
@@ -256,6 +271,12 @@ all-Copyright :
 install-all-asir-lib:
 	(cd asir2000 ; make install-lib-small)
 
+install-document: install-document-kan96xx install-document-asir-contrib
+
+install-document-kan96xx: install-kan96xx
+	(cd kan96xx ; make install-document)
+install-document-asir-contrib: install-asir-contrib
+	(cd asir-contrib; make install-document)
 
 ## Targets for debugging
 install-for-debug: