===================================================================
RCS file: /home/cvs/OpenXM/src/gc/Makefile,v
retrieving revision 1.21
retrieving revision 1.25
diff -u -p -r1.21 -r1.25
--- OpenXM/src/gc/Makefile	2012/05/30 02:02:39	1.21
+++ OpenXM/src/gc/Makefile	2015/09/27 10:50:23	1.25
@@ -1,31 +1,34 @@
-# $OpenXM: OpenXM/src/gc/Makefile,v 1.20 2012/05/13 09:05:46 ohara Exp $
+# $OpenXM: OpenXM/src/gc/Makefile,v 1.24 2015/08/04 05:33:11 ohara 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=gc-7.2b
-DISTFILES=${DISTNAME}.tar.gz
-# WRKSRC=work/${DISTNAME}
-WRKSRC=work/gc-7.2
-PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir2000/gc-7.diff
-#PATCHFILES = 
+#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}
+# WRKSRC=work/gc-20150803-git/bdwgc
+#PATCHFILES = ${OpenXM_HOME}/../OpenXM_contrib2/asir2000/gc-7.diff
+PATCHFILES = 
 
 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
@@ -39,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-sygwin ; \
+		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 --enable-static --disable-shared )
+configure-msys:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix --build=x86_64-w32-mingw32  )
+configure-others:
+	prefix=`cd ${OpenXM_HOME}; pwd`  ; \
+	(cd ${WRKSRC}; ./configure --disable-threads --prefix=$$prefix )
 
 build : configure
 	@if [ ! -f work/.build_done ]; then \