===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.28
diff -u -p -r1.22 -r1.28
--- OpenXM_contrib2/asir2000/Makefile.am	2005/07/12 14:47:13	1.22
+++ OpenXM_contrib2/asir2000/Makefile.am	2008/03/19 07:05:55	1.28
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.21 2005/07/12 01:23:20 noro Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.27 2007/11/11 15:54:02 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -15,8 +15,12 @@ asir_SOURCES  = parse/main.c
 asir_LDADD    = libasir.a libasir-gc.a
 CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
 
-GC            = gc6.5
 GC_TAR_GZ     = ${GC}.tar.gz
+if USE_GC7
+GC_PATCH      = gc-7.0-risa.diff
+else
+GC_PATCH      = gc6.diff gc6-risa.diff
+endif
 GC_DISTDIR    = @GC_DISTDIR@
 GC_MASTER_SITE=ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
 OX_FETCH      = ${bindir}/oxfetch.sh
@@ -41,7 +45,7 @@ LIBS     = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
-libasir-gc.a: ${GC}-risa.diff parse/gc_risa.c
+libasir-gc.a: ${GC_PATCH} parse/gc_risa.c
 	-if [ ! -f ${top_srcdir}/.gc_fetch_done ]; then \
 		if [ ! -f ${GC_DISTDIR}/${GC_TAR_GZ} ]; then \
 			${OX_FETCH} ${GC_MASTER_SITE}${GC_TAR_GZ} ${GC_DISTDIR}; \
@@ -49,30 +53,19 @@ libasir-gc.a: ${GC}-risa.diff parse/gc_risa.c
 		touch ${top_srcdir}/.gc_fetch_done ; \
 	fi
 	-if [ ! -f ${top_srcdir}/.gc_risa_done ]; then \
-	    (cd ${top_srcdir}; tar xzvf ${GC_DISTDIR}/${GC_TAR_GZ}; patch -p0 < ${GC}-risa.diff) ; \
+	    (cd ${top_srcdir}; tar xzvf ${GC_DISTDIR}/${GC_TAR_GZ}) ; \
+		for i in ${GC_PATCH} ; do \
+	    (cd ${top_srcdir}/${GC}; patch -p1 < ../$$i) ; \
+		done ; \
 	    touch ${top_srcdir}/.gc_risa_done ; \
 	fi
-	-if [ "${USE_GC_ZEROPAGE}" = yes \
-            -a ! -f ${top_srcdir}/${GC}/.patch_gc_zeropage_done ]; then \
-	    (cd ${top_srcdir}/${GC}; patch < ../gc_zeropage.diff) ; \
-	    touch ${top_srcdir}/${GC}/.patch_gc_zeropage_done ; \
-	fi
-	-if [ "${USE_GC_INTERIX}" = yes \
-            -a ! -f ${top_srcdir}/${GC}/.patch_gc_interix_done ]; then \
-	    (cd ${top_srcdir}/${GC}; patch -p0 < ../gc_interix.diff) ; \
-	    touch ${top_srcdir}/${GC}/.patch_gc_interix_done ; \
-	fi
 	-if [ "${USE_GC_SPARC64}" = yes \
             -a ! -f ${top_srcdir}/${GC}/.patch_gc_sparc64_done ]; then \
 	    (cd ${top_srcdir}/${GC}; patch -p0 < ../gc_sparc64.diff) ; \
 	    touch ${top_srcdir}/${GC}/.patch_gc_sparc64_done ; \
 	fi
 	-if [ ! -f ${top_srcdir}/${GC}/.configure_done ]; then \
-	    if [ -n "${host_alias}" ]; then \
-	        (cd ${top_srcdir}/${GC}; ./configure --host=${host_alias} --disable-threads) ; \
-	    else \
-	        (cd ${top_srcdir}/${GC}; ./configure --disable-threads) ; \
-	    fi ; \
+	    (cd ${top_srcdir}/${GC}; ./configure ${GC_CONFIGURE_ARGS}) ; \
 	    touch ${top_srcdir}/${GC}/.configure_done ; \
 	fi
 	(cd ${top_srcdir}/${GC}; ${MAKE})