===================================================================
RCS file: /home/cvs/OpenXM/src/Makefile,v
retrieving revision 1.150
retrieving revision 1.153
diff -u -p -r1.150 -r1.153
--- OpenXM/src/Makefile	2005/11/10 05:56:50	1.150
+++ OpenXM/src/Makefile	2007/03/18 04:52:38	1.153
@@ -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.152 2007/03/17 09:19:55 noro Exp $
 
 OpenXM_HOME=..
 OpenXM_contrib2=../../OpenXM_contrib2
@@ -9,7 +9,7 @@ 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-gc: install-util 
 	(cd gc; ${MAKE} all)
@@ -61,7 +61,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 +81,14 @@ all-rc:
 all-util: configure-util
 	(cd util; ${MAKE} all)
 
+all-oxcdd: install-oxtoolkit
+	-(cd ox_cdd; ${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-oxtags:
 	(cd ../doc/OpenXM-web; ${MAKE} install-exec)
@@ -146,7 +149,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
 
@@ -175,6 +178,9 @@ install-rc: all-rc
 
 install-asir-port:
 	(cd asir-port; ${MAKE} install)
+
+install-oxcdd: all-oxcdd
+	-(cd ox_cdd; ${MAKE} install)
 
 clean:
 	-rm ./.configure-links-done