===================================================================
RCS file: /home/cvs/OpenXM/src/gmp/Makefile,v
retrieving revision 1.9
retrieving revision 1.14
diff -u -p -r1.9 -r1.14
--- OpenXM/src/gmp/Makefile	2004/03/25 04:54:36	1.9
+++ OpenXM/src/gmp/Makefile	2007/04/03 17:53:28	1.14
@@ -1,54 +1,64 @@
-# $OpenXM: OpenXM/src/gmp/Makefile,v 1.8 2004/03/25 03:17:09 ohara Exp $
+# $OpenXM: OpenXM/src/gmp/Makefile,v 1.13 2007/02/18 05:31:58 ohara Exp $
 OpenXM_HOME=../..
 PREFIX=${OpenXM_HOME}
 DISTDIR=${OpenXM_HOME}/../OpenXM_dist
-RM = /bin/rm -rf
+RM = /bin/rm
 MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
-DISTFILES=gmp-4.1.2.tar.gz
-GMP=gmp-4.1.2
+DISTNAME=gmp-4.2.1
+DISTFILES=${DISTNAME}.tar.gz
+WRKSRC=work/${DISTNAME}
+PATCHFILES = gmp.diff
 
 all : build 
 
 fetch:
-	@if [ ! -f .fetch_done ]; then \
+	-mkdir work
+	@if [ ! -f work/.fetch_done ]; then \
 		${OpenXM_HOME}/bin/oxfetch.sh ${MASTER_SITE}${DISTFILES} ${DISTDIR}; \
 	fi 
-	@touch .fetch_done
+	@touch work/.fetch_done
 
 extract: fetch
-	-mkdir work
-	@if [ ! -f .extract_done ]; then \
+	@if [ ! -f work/.extract_done ]; then \
 	    cat ${DISTDIR}/${DISTFILES} | (cd work ; tar xzvf -) ; \
 	fi 
-	@touch .extract_done
+	@touch work/.extract_done
 
 patch: extract
-	@touch .patch_done
+	@if [ ! -f work/.patch_done ]; then \
+        for i in ${PATCHFILES} ; do \
+	        cat $$i | (cd ${WRKSRC}; patch -p0) ; \
+        done ; \
+        if [ `uname` = Darwin -a `uname -m` = i386 ]; then \
+            (cd ${WRKSRC}/mpn/x86; ${RM} *dive_1* */*dive_1* */*/*dive_1* */*mode1o* */*/*mode1o*) ; \
+        fi ; \
+	fi
+	@touch work/.patch_done
 
 configure: patch
-	@if [ ! -f .configure_done ]; then \
-		(cd work/${GMP} ; ./configure --prefix `cd ../..; cd ${OpenXM_HOME}; pwd`) ; \
+	@if [ ! -f work/.configure_done ]; then \
+		prefix=`cd ${OpenXM_HOME}; pwd` ; \
+		(cd ${WRKSRC} ; CC=${CC} ./configure --prefix="$$prefix" --enable-cxx) ; \
 	fi
-	@touch .configure_done
+	@touch work/.configure_done
 
 build : configure
-	@if [ ! -f .build_done ]; then \
-		(cd work/${GMP} ; ${MAKE}) ; \
+	@if [ ! -f work/.build_done ]; then \
+		(cd ${WRKSRC} ; ${MAKE} CC=${CC}) ; \
 	fi
-	@touch .build_done
+	@touch work/.build_done
 
 install: build
 	-mkdir ${PREFIX}/bin ${PREFIX}/lib
-	@if [ ! -f .install_done ]; then \
-		(cd work/${GMP} ; ${MAKE} install) ; \
-		for i in config.h gmp-impl.h gmp-mparam.h; do \
-			cp work/${GMP}/$$i ${OpenXM_HOME}/include ; \
+	@if [ ! -f work/.install_done ]; then \
+		(cd ${WRKSRC} ; ${MAKE} install) ; \
+		for i in config.h gmp-impl.h gmp-mparam.h fib_table.h mp_bases.h; do \
+			cp ${WRKSRC}/$$i ${OpenXM_HOME}/include ; \
 		done ; \
 	fi
-	@touch .install_done
+	@touch work/.install_done
 
 clean:
-	-$(RM) ./.*_done
-	-$(RM) -rf work
+	-${RM} -rf work
 
 distclean: clean