===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.155
retrieving revision 1.159
diff -u -p -r1.155 -r1.159
--- OpenXM/src/Makefile	2009/02/08 05:05:35	1.155
+++ OpenXM/src/Makefile	2009/02/23 02:12:24	1.159
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.154 2008/08/08 05:41:26 ohara Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.158 2009/02/23 01:34:51 takayama Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib2=../../OpenXM_contrib2
@@ -79,14 +79,23 @@ all-misc: install-util
 
 all-rc:
 	(cd ${RCDIR}; ${MAKE})
-all-util: configure-util
-	(cd util; ${MAKE} all)
 
+all-util: all-util-bin all-util-lib
+
+all-util-bin: configure-util
+	(cd util; ${MAKE} all-bin)
+
+all-util-lib: configure-util
+	(cd util; ${MAKE} all-lib)
+
 all-oxcdd: install-oxtoolkit
 	-(cd ox_cdd; ${MAKE} all)
 all-oxmgraph: configure-oxmgraph
 	-(cd oxmgraph; ${MAKE} all)
 
+all-document-asir-contrib: configure-document-asir-contrib
+	(cd asir-contrib/packages/doc; ${MAKE} all)
+
 install: install-oxtags install-util install-asir install-gnuplot \
 	 install-k097 install-kan96xx \
 	 install-kxx install-openmath install-oxmath install-pari \
@@ -97,9 +106,14 @@ install: install-oxtags install-util install-asir inst
 install-oxtags:
 	(cd ../doc/OpenXM-web; ${MAKE} install-exec)
 
-install-util: all-util
-	(cd util; ${MAKE} install)
+install-util-bin: all-util-bin
+	(cd util; ${MAKE} install-bin)
 
+install-util-lib: all-util-lib
+	(cd util; ${MAKE} install-lib)
+
+install-util: install-util-bin install-util-lib
+
 install-gc: all-gc
 	(cd gc; ${MAKE} install)
 
@@ -259,6 +273,9 @@ configure-pari: install-util
 configure-oxmgraph: 
 	-(cd oxmgraph; ./make-configure)
 
+configure-document-asir-contrib: install-util-bin install-asir-doc
+	(cd asir-contrib/packages/doc; ./make-configure)
+
 clean-rc:
 	(cd $(RCDIR); ${MAKE} clean)
 
@@ -270,8 +287,8 @@ install-document: install-document-kan96xx install-doc
 install-document-kan96xx: install-kan96xx
 	(cd kan96xx; ${MAKE} install-document)
 
-install-document-asir-contrib: install-asir-contrib
-	(cd asir-contrib; ${MAKE} install-document)
+install-document-asir-contrib: all-document-asir-contrib
+	(cd asir-contrib/packages/doc; ${MAKE} install ; ${MAKE} install-document)
 
 ## Targets for debugging
 install-for-debug: