===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.150
retrieving revision 1.155
diff -u -p -r1.150 -r1.155
--- OpenXM/src/Makefile	2005/11/10 05:56:50	1.150
+++ OpenXM/src/Makefile	2009/02/08 05:05:35	1.155
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM/src/Makefile,v 1.149 2005/07/19 03:37:49 takayama Exp $
+## $OpenXM: OpenXM/src/Makefile,v 1.154 2008/08/08 05:41:26 ohara 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-kxx all-pari all-phc all-openmath all-oxmath all-tigers all-fep all-phcpack all-oxcdd \
+	all-oxmgraph
 
 all-gc: install-util 
 	(cd gc; ${MAKE} all)
@@ -61,7 +62,7 @@ all-phc:
 	(cd phc; ${MAKE} all)
 
 all-phcpack:
-	-@if [ "`which gnatmake`" ]; then \
+	-@if ../misc/which.pl -s gnatmake; then \
 		(cd phcpack; ${MAKE} all) ; \
 	fi
 
@@ -81,11 +82,17 @@ all-rc:
 all-util: configure-util
 	(cd util; ${MAKE} all)
 
+all-oxcdd: install-oxtoolkit
+	-(cd ox_cdd; ${MAKE} all)
+all-oxmgraph: configure-oxmgraph
+	-(cd oxmgraph; ${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-misc install-fep install-phcpack install-oxcdd \
+     install-oxmgraph
 
 install-oxtags:
 	(cd ../doc/OpenXM-web; ${MAKE} install-exec)
@@ -146,7 +153,7 @@ install-phc: all-phc
 	(cd phc; ${MAKE} install)
 
 install-phcpack: all-phcpack
-	-@if [ "`which gnatmake`" ]; then \
+	-@if ../misc/which.pl gnatmake; then \
 		(cd phcpack; ${MAKE} install) ; \
 	fi
 
@@ -176,17 +183,24 @@ install-rc: all-rc
 install-asir-port:
 	(cd asir-port; ${MAKE} install)
 
+install-oxcdd: all-oxcdd
+	-(cd ox_cdd; ${MAKE} install)
+
+install-oxmgraph: all-oxmgraph
+	-(cd oxmgraph; ${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 \
 	           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 ; do \
 		(cd $$i; ${MAKE} distclean); \
 	done
 	-(cd ${BINDIR} && rm -f  d0 k0 ox ox_sm1 oxlog oxweave sm1)
@@ -195,7 +209,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-util:
 	(cd util; ./make-configure)
@@ -241,14 +256,14 @@ configure-oxmath:
 configure-pari: install-util
 	(cd pari; ${MAKE} configure)
 
+configure-oxmgraph: 
+	-(cd oxmgraph; ./make-configure)
+
 clean-rc:
 	(cd $(RCDIR); ${MAKE} clean)
 
 all-Copyright:
 	(cd $(COPYRIGHTDIR); ${MAKE} all)
-
-install-all-asir-lib:
-	(cd asir2000; ${MAKE} install-lib-small)
 
 install-document: install-document-kan96xx install-document-asir-contrib