===================================================================
RCS file: /home/cvs/OpenXM/src/gc/Makefile,v
retrieving revision 1.18
retrieving revision 1.26
diff -u -p -r1.18 -r1.26
--- OpenXM/src/gc/Makefile	2010/08/18 07:33:10	1.18
+++ OpenXM/src/gc/Makefile	2015/09/28 05:52:13	1.26
@@ -1,35 +1,40 @@
-# $OpenXM: OpenXM/src/gc/Makefile,v 1.17 2008/03/19 07:11:53 ohara Exp $
+# $OpenXM: OpenXM/src/gc/Makefile,v 1.25 2015/09/27 10:50:23 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/
+MASTER_SITE=http://www.math.kobe-u.ac.jp/pub/OpenXM/misc/
 # Original. http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/
-DISTNAME=gc6.8
-DISTFILES=${DISTNAME}.tar.gz
+#DISTNAME=gc-20150803-git
+DISTNAME=gc-7.4.2
+ATOMIC=libatomic_ops-7.4.0
+DISTFILES=${DISTNAME}.tar.gz ${ATOMIC}.tar.gz
 WRKSRC=work/${DISTNAME}
-PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir2000/gc6.diff
+# WRKSRC=work/gc-20150803-git/bdwgc
+#PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir2000/gc-7.diff
+PATCHFILES = gc-cygwin64.diff
 
 all : build
 
 fetch:
 	-mkdir work
 	@if [ ! -f work/.fetch_done ]; then \
-		${OpenXM_HOME}/bin/oxfetch.sh ${MASTER_SITE}${DISTFILES} ${DISTDIR}; \
+		for i in ${DISTFILES}; do ${OpenXM_HOME}/bin/oxfetch.sh ${MASTER_SITE}$$i ${DISTDIR}; done ; \
 	fi
 	@touch work/.fetch_done
 
 extract: fetch
 	@if [ ! -f work/.extract_done ]; then \
-	    cat ${DISTDIR}/${DISTFILES} | (cd work; tar xzvf -) ; \
+		for i in ${DISTFILES}; do cat ${DISTDIR}/$$i | (cd work; tar xzvf -) ; done ; \
 		chmod +x ${WRKSRC}/install-sh ; \
 	fi
+	-(cd ${WRKSRC}; ln -sf ../${ATOMIC} libatomic_ops)
 	@touch work/.extract_done
 
 patch: extract
 	@if [ ! -f work/.patch_done ]; then \
         for i in ${PATCHFILES} ; do \
-	        cat $$i | (cd ${WRKSRC}; patch -p1) ; \
+	        cat $$i | (cd ${WRKSRC}; patch -p0) ; \
         done ; \
 	fi
 	@touch work/.patch_done
@@ -37,9 +42,25 @@ patch: extract
 configure : patch
 	@if [ ! -f work/.configure_done ]; then \
 		prefix=`cd ${OpenXM_HOME}; pwd` ; \
-		(cd ${WRKSRC}; ./configure --disable-threads --prefix="$$prefix" ) ; \
+		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}; ./configure --disable-threads --prefix=$$prefix )
+configure-msys:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix --build=x86_64-w64-mingw32  )
+configure-others:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix )
 
 build : configure
 	@if [ ! -f work/.build_done ]; then \