===================================================================
RCS file: /home/cvs/OpenXM/src/ox_cdd/Makefile,v
retrieving revision 1.3
retrieving revision 1.8
diff -u -p -r1.3 -r1.8
--- OpenXM/src/ox_cdd/Makefile	2005/05/25 06:43:44	1.3
+++ OpenXM/src/ox_cdd/Makefile	2016/04/01 19:24:00	1.8
@@ -1,21 +1,21 @@
-# $OpenXM: OpenXM/src/ox_cdd/Makefile,v 1.2 2005/05/25 05:06:06 noro Exp $
+# $OpenXM: OpenXM/src/ox_cdd/Makefile,v 1.7 2015/02/21 06:20:36 ohara Exp $
 
 OpenXM_HOME=../..
 OpenXM_LIBDIR=../../lib
-OpenXM_LIB = -L$(OpenXM_LIBDIR) -lox -lgc -lgmp
+OpenXM_LIB = -L$(OpenXM_LIBDIR) -lox -lgc -lgmp -lmpfr
 INCLUDES = -I$(OpenXM_HOME)/include
 PREFIX=${OpenXM_HOME}
 DISTDIR=${OpenXM_HOME}/../OpenXM_dist
 RM = /bin/rm
-MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
-CDDLIB_TB=cddlib-093d.tar.gz
+MASTER_SITE=http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
 MVOL_TB=MixedVol.tar.gz
 CFLAGS = -g -Wall -finline-functions
 MVOLINCLUDE=work/MixedVol/SRC
 
 GMPDEF = -DGMPRATIONAL
 
-CDD=cddlib-093d
+CDD=cddlib-094d
+CDDLIB_TB=$(CDD).tar.gz
 CDD_HOME= work/$(CDD)
 
 CDD_LIB = -lcdd
@@ -38,34 +38,34 @@ ox_cdd: $(CDDOBJ)
 	$(CC) $(CDDOBJ) $(LIBS) -o $@
 
 ox_cddgmp: $(CDDOBJG)
-	g++ $(CDDOBJG) $(LIBSG) -o $@
+	$(CXX) $(CDDOBJG) $(LIBSG) -o $@
 
 ox_sres: $(SRESOBJ)
-	g++ $(SRESOBJ) $(LIBS) -o $@
+	$(CXX) $(SRESOBJ) $(LIBS) -o $@
 
 ox_sresgmp: $(SRESOBJG)
-	g++ $(SRESOBJG) $(LIBSG) -o $@
+	$(CXX) $(SRESOBJG) $(LIBSG) -o $@
 
 ox_cdd.o : ox_cdd.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
 ox_cddgmp.o : ox_cdd.c
-	$(CC) -o ox_cddgmp.o $(CFLAGS) $(GMPDEF) $(INCLUDES) -c $<
+	$(CC) -o ox_cddgmp.o $(CFLAGS) $(GMPDEF) $(INCLUDES) -c ox_cdd.c
 
 ox_sres.o : ox_sres.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
 ox_sresgmp.o : ox_sres.c
-	$(CC) -o ox_sresgmp.o $(CFLAGS) $(GMPDEF) $(INCLUDES) -c $<
+	$(CC) -o ox_sresgmp.o $(CFLAGS) $(GMPDEF) $(INCLUDES) -c ox_sres.c
 
 cddlib.o : cddlib.c
 	$(CC) $(CFLAGS) $(INCLUDES) -c $<
 
 cddlibgmp.o : cddlib.c
-	$(CC) -o cddlibgmp.o  $(CFLAGS) $(GMPDEF) $(INCLUDES) -c $<
+	$(CC) -o cddlibgmp.o  $(CFLAGS) $(GMPDEF) $(INCLUDES) -c cddlib.c
 
 mvol.o : mvol.cpp
-	g++ $(CFLAGS) -I$(MVOLINCLUDE) -c $<
+	$(CXX) $(CFLAGS) -I$(MVOLINCLUDE) -c $<
 
 libs : ox gc libgmp cdd
 
@@ -120,12 +120,15 @@ extract: fetch
 	@touch work/.extract_done
 
 patch: extract
+	@if [ ! -f work/.patch_done ]; then \
+		cd work/${CDD}; patch -p0 < ../../cddlib.patch ; \
+	fi
 	@touch work/.patch_done
 
 configure: patch
 	@if [ ! -f work/.configure_done ]; then \
 		prefix=`cd ${OpenXM_HOME}; pwd` ; \
-		(cd work/${CDD} ; ./configure CXX=cc --prefix="$$prefix" ) ; \
+		(cd work/${CDD} ; ./configure CXX=cc LDFLAGS=-L$$prefix/lib --prefix="$$prefix" ) ; \
 	fi
 	@touch work/.configure_done