===================================================================
RCS file: /home/cvs/OpenXM/src/gmp/Makefile,v
retrieving revision 1.17
retrieving revision 1.23
diff -u -p -r1.17 -r1.23
--- OpenXM/src/gmp/Makefile	2009/11/07 12:05:42	1.17
+++ OpenXM/src/gmp/Makefile	2017/03/31 01:20:06	1.23
@@ -1,11 +1,11 @@
-# $OpenXM: OpenXM/src/gmp/Makefile,v 1.16 2008/04/01 12:13:39 ohara Exp $
+# $OpenXM: OpenXM/src/gmp/Makefile,v 1.22 2017/03/30 13:17:15 takayama Exp $
 OpenXM_HOME=../..
 PREFIX=${OpenXM_HOME}
 DISTDIR=${OpenXM_HOME}/../OpenXM_dist
 RM = /bin/rm
-MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
-DISTNAME=gmp-4.2.2
-DISTFILES=${DISTNAME}-core2.tgz
+MASTER_SITE=http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
+DISTNAME=gmp-6.1.2
+DISTFILES=${DISTNAME}.tar.bz2
 WRKSRC=work/${DISTNAME}
 #PATCHFILES = gmp.diff
 PATCHFILES = 
@@ -21,7 +21,7 @@ fetch:
 
 extract: fetch
 	@if [ ! -f work/.extract_done ]; then \
-	    cat ${DISTDIR}/${DISTFILES} | (cd work ; tar xzvf -) ; \
+	    cat ${DISTDIR}/${DISTFILES} | (cd work ; tar xjvf -) ; \
 	fi 
 	@touch work/.extract_done
 
@@ -32,19 +32,32 @@ patch: extract
 	            cat $$i | (cd ${WRKSRC}; patch -p0) ; \
             fi ; \
         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
+configure : patch
 	@if [ ! -f work/.configure_done ]; then \
 		prefix=`cd ${OpenXM_HOME}; pwd` ; \
-		(cd ${WRKSRC} ; CC=${CC} ./configure --prefix="$$prefix" --enable-cxx) ; \
+		if [  "`uname | sed -e 's/_.*$$//'`" = "CYGWIN" ]; then \
+		  make configure-cygwin ; \
+		elif [  "`uname | sed -e 's/_.*$$//'`" = "MSYS" ];  then \
+		  make configure-msys ; \
+		else \
+		  make configure-others ; \
+		fi ; \
 	fi
 	@touch work/.configure_done
 
+configure-cygwin:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; CC=${CC} ./configure  --prefix=$$prefix --enable-cxx --enable-static --disable-shared)
+configure-msys:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; CC=${CC} ./configure --prefix=$$prefix --enable-cxx --build=x86_64-w64-mingw32  )
+configure-others:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; CC=${CC} ./configure --prefix=$$prefix --enable-cxx)
+
 build : configure
 	@if [ ! -f work/.build_done ]; then \
 		(cd ${WRKSRC} ; ${MAKE} CC=${CC}) ; \
@@ -55,7 +68,7 @@ install: build
 	-mkdir ${PREFIX}/bin ${PREFIX}/lib
 	@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 \
+		for i in config.h gmp-impl.h gmp-mparam.h fib_table.h mp_bases.h fac_table.h ; do \
 			cp ${WRKSRC}/$$i ${OpenXM_HOME}/include ; \
 		done ; \
 	fi