===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.133
retrieving revision 1.146
diff -u -p -r1.133 -r1.146
--- OpenXM/src/Makefile	2003/11/27 12:10:18	1.133
+++ OpenXM/src/Makefile	2004/12/07 15:26:41	1.146
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.132 2003/09/14 01:19:55 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.145 2004/07/27 07:12:25 ohara Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib=../../OpenXM_contrib
@@ -17,7 +17,7 @@ all-gc: install-util 
 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 
@@ -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)
@@ -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,6 +167,9 @@ 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_*
@@ -211,17 +213,26 @@ distclean: clean
 	       $(BINDIR)/oxlog $(BINDIR)/oxweave $(BINDIR)/sm1 \
 	       $(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)
 
@@ -229,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) 
@@ -248,7 +259,7 @@ configure-oxmath:
 		echo "ox_math will not be compiled." ; \
 	fi
 
-configure-pari:
+configure-pari: install-util
 	(cd pari ; make configure)
 
 
@@ -260,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: