===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.154
retrieving revision 1.160
diff -u -p -r1.154 -r1.160
--- OpenXM/src/Makefile	2008/08/08 05:41:26	1.154
+++ OpenXM/src/Makefile	2010/07/31 10:00:59	1.160
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.153 2007/03/18 04:52:38 noro Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.159 2009/02/23 02:12:24 takayama Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib2=../../OpenXM_contrib2
@@ -9,7 +9,8 @@ RCDIR=../rc
 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-phcpack all-oxcdd
+     all-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep all-phcpack all-oxcdd \
+	all-oxmgraph all-mcpp
 
 all-gc: install-util 
 	(cd gc; ${MAKE} all)
@@ -78,24 +79,43 @@ 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-mcpp: configure-mcpp
+	-(cd mcpp; ${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 \
 	 install-phc install-tigers install-asir-doc install-asir-contrib \
-	 install-misc install-fep install-phcpack install-oxcdd
+	 install-misc install-fep install-phcpack install-oxcdd \
+     install-oxmgraph install-mcpp
 
 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)
 
@@ -182,17 +202,24 @@ install-asir-port:
 install-oxcdd: all-oxcdd
 	-(cd ox_cdd; ${MAKE} install)
 
+install-oxmgraph: all-oxmgraph
+	-(cd oxmgraph; ${MAKE} install)
+
+install-mcpp: all-mcpp
+	-(cd mcpp; ${MAKE} install)
+
 clean:
 	-rm ./.configure-links-done
 	-@for i in OpenMath asir-contrib asir-doc asir2000 gc gmp gnuplot \
 	           k097 kan96xx kxx ox_math ox_toolkit oxc pari phc phcpack tigers \
+               oxmgraph mcpp \
 	           util ${OpenXM_contrib2}/fep ; do \
 		(cd $$i; ${MAKE} clean); \
 	done
 
 distclean: clean
 	-@for i in OpenMath asir2000 gc gmp gnuplot kan96xx kxx ox_math \
-	           ox_toolkit oxc pari phc phcpack tigers ; do \
+	           ox_toolkit oxc pari phc phcpack tigers oxmgraph mcpp ; do \
 		(cd $$i; ${MAKE} distclean); \
 	done
 	-(cd ${BINDIR} && rm -f  d0 k0 ox ox_sm1 oxlog oxweave sm1)
@@ -201,7 +228,8 @@ distclean: clean
 configure: configure-util configure-asir \
 	   configure-gnuplot \
 	   configure-k097 configure-kan96xx configure-kxx configure-oxmath \
-	   configure-pari configure-gmp configure-asir-doc configure-asir-contrib
+	   configure-pari configure-gmp configure-asir-doc configure-asir-contrib \
+       configure-oxmgraph configure-mcpp
 
 configure-util:
 	(cd util; ./make-configure)
@@ -247,6 +275,15 @@ configure-oxmath:
 configure-pari: install-util
 	(cd pari; ${MAKE} configure)
 
+configure-oxmgraph: 
+	-(cd oxmgraph; ./make-configure)
+
+configure-mcpp:
+	-(cd mcpp; ${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)
 
@@ -258,8 +295,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: