===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.26
retrieving revision 1.34
diff -u -p -r1.26 -r1.34
--- OpenXM_contrib2/asir2000/Makefile.am	2007/11/11 08:44:12	1.26
+++ OpenXM_contrib2/asir2000/Makefile.am	2009/03/04 09:15:36	1.34
@@ -1,4 +1,4 @@
-## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.25 2007/08/06 08:15:25 saito Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.33 2009/03/04 06:51:41 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
@@ -12,21 +12,24 @@ SUBDIRS  = asm builtin engine fft include io lib parse
 asirdir       = ${libdir}/asir
 asir_PROGRAMS = asir
 asir_SOURCES  = parse/main.c
-asir_LDADD    = libasir.a libasir-gc.a
+asir_LDADD    = libasir.a @ASIR_GCLIB@
 CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
 
 GC_TAR_GZ     = ${GC}.tar.gz
-GC_PATCH      = gc6.5-risa.diff
+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
 
 DEFS     = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-           -I${top_srcdir}/${GC}/include \
-           @PARIINC@ @MPIINC@ @X_CFLAGS@
+           @GCINC@ @PARIINC@ @X_CFLAGS@
 
-GLIB  = libasir-gc.a
+GLIB  = @ASIR_GCLIB@
 ALIB  = asm/libasm.a
 BLIB  = builtin/libfunc.a
 ELIB  = engine/libca.a
@@ -35,13 +38,15 @@ IOLIB = io/libio.a
 PLIB  = parse/libparse.a
 
 ASIRLIB  = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
-LIBS     = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
+LIBS     = @LIBS@ @GCLIB@ @PARILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
 # EXTRALIBS = @EXTRALIBS@
 
+all-recursive: ${GLIB}
+
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
-libasir-gc.a: ${GC_PATCH} parse/gc_risa.c
+libasir-gc.a: ${GC_PATCH}
 	-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}; \
@@ -50,19 +55,11 @@ libasir-gc.a: ${GC_PATCH} parse/gc_risa.c
 	fi
 	-if [ ! -f ${top_srcdir}/.gc_risa_done ]; then \
 	    (cd ${top_srcdir}; tar xzvf ${GC_DISTDIR}/${GC_TAR_GZ}) ; \
-	    (cd ${top_srcdir}/${GC}; patch -p1 < ../${GC_PATCH}) ; \
+		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) ; \
@@ -73,23 +70,17 @@ libasir-gc.a: ${GC_PATCH} parse/gc_risa.c
 	    touch ${top_srcdir}/${GC}/.configure_done ; \
 	fi
 	(cd ${top_srcdir}/${GC}; ${MAKE})
-	cp ${top_srcdir}/${GC}/.libs/libgc.a ${GLIB}
-	(cd ${top_srcdir}/parse; ${MAKE} gc_risa.o)
-	${AR} q ${GLIB} ${top_srcdir}/parse/gc_risa.o
-	${RANLIB} ${GLIB}
+	cp ${top_srcdir}/${GC}/.libs/libgc.a $@
 
-libasir.a: ${ASIRLIB}
+libasir.a: ${ASIRLIB} ${GLIB} parse/gc_risa.c
 	-mkdir ${top_srcdir}/libtmp
 	-rm -f ${top_srcdir}/libtmp/*  ${top_srcdir}/$@
 	for i in ${ASIRLIB}; do (cd ${top_srcdir}/libtmp; ar x ../$$i; chmod 644 *) done
+	(cd ${top_srcdir}/parse; ${MAKE} gc_risa.o; cp gc_risa.o ../libtmp)
 	(cd ${top_srcdir}/libtmp; ${AR} cq ../$@ *.o)
 	(cd ${top_srcdir}; ${RANLIB} $@)
 	-rm -rf ${top_srcdir}/libtmp
 
-#asir.o: umain.o ${ASIRLIB} ${GLIB}
-#	-rm $@
-#	ld -r $@ umain.o ${ASIRLIB} ${GLIB} ${LIBS} ${EXTRALIBS}
-
 install-libasir: libasir.a
 	mkdir -p ${DESTDIR}${libdir}
 	${INSTALL_DATA} libasir.a ${DESTDIR}${libdir}/libasir${libasir_postfix}.a
@@ -136,3 +127,9 @@ tarball:
 	DESTDIR=`cd tmp; pwd` ${MAKE} install-openxm
 	(cd tmp${prefix}; tar cf - * ) | gzip -c > asir-openxm-${VERSION}.tgz
 	-rm -rf tmp
+
+clean-gc:
+	-rm -rf ${top_srcdir}/.gc_*_done ${top_srcdir}/${GC}
+	-rm -rf ${top_srcdir}/autom4te.cache
+
+distclean-recursive: clean-gc