===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v
retrieving revision 1.30
retrieving revision 1.35
diff -u -p -r1.30 -r1.35
--- OpenXM_contrib2/asir2000/Makefile.in	2007/11/11 08:44:12	1.30
+++ OpenXM_contrib2/asir2000/Makefile.in	2009/02/06 10:11:11	1.35
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.10 from Makefile.am.
+# Makefile.in generated by automake 1.10.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -52,7 +52,7 @@ asirPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(asir_PROGRAMS)
 am_asir_OBJECTS = main.$(OBJEXT)
 asir_OBJECTS = $(am_asir_OBJECTS)
-asir_DEPENDENCIES = libasir.a libasir-gc.a
+asir_DEPENDENCIES = libasir.a
 DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp =
 am__depfiles_maybe =
@@ -87,6 +87,7 @@ distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
+ASIR_GCLIB = @ASIR_GCLIB@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
@@ -106,6 +107,8 @@ EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 FEPLIB = @FEPLIB@
 GC = @GC@
+GCINC = @GCINC@
+GCLIB = @GCLIB@
 GC_CONFIGURE_ARGS = @GC_CONFIGURE_ARGS@
 GC_DISTDIR = @GC_DISTDIR@
 GREP = @GREP@
@@ -117,7 +120,7 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACKLIB = @LAPACKLIB@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
+LIBS = @LIBS@ @GCLIB@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAINT = @MAINT@
@@ -139,9 +142,7 @@ RANLIB = @RANLIB@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-USE_GC_INTERIX = @USE_GC_INTERIX@
 USE_GC_SPARC64 = @USE_GC_SPARC64@
-USE_GC_ZEROPAGE = @USE_GC_ZEROPAGE@
 VERSION = @VERSION@
 XMKMF = @XMKMF@
 XPMLIB = @XPMLIB@
@@ -204,6 +205,7 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
+top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
@@ -213,17 +215,17 @@ AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 SUBDIRS = asm builtin engine fft include io lib parse ${PLOTDIR}
 asirdir = ${libdir}/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
+@USE_GC7_FALSE@GC_PATCH = gc6.diff gc6-risa.diff
+@USE_GC7_TRUE@GC_PATCH = gc-7.0-risa.diff
 GC_MASTER_SITE = ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
 OX_FETCH = ${bindir}/oxfetch.sh
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-           -I${top_srcdir}/${GC}/include \
-           @PARIINC@ @MPIINC@ @X_CFLAGS@
+           @GCINC@ @PARIINC@ @MPIINC@ @X_CFLAGS@
 
-GLIB = libasir-gc.a
+GLIB = @ASIR_GCLIB@
 ALIB = asm/libasm.a
 BLIB = builtin/libfunc.a
 ELIB = engine/libca.a
@@ -388,8 +390,8 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonemtpy = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	mkid -fID $$unique
 tags: TAGS
 
@@ -414,8 +416,8 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEP
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
 	  test -n "$$unique" || unique=$$empty_fix; \
 	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
@@ -425,13 +427,12 @@ ctags: CTAGS
 CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
 	tags=; \
-	here=`pwd`; \
 	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
 	unique=`for i in $$list; do \
 	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
 	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
+	  $(AWK) '{ files[$$0] = 1; nonempty = 1; } \
+	      END { if (nonempty) { for (i in files) print i; }; }'`; \
 	test -z "$(CTAGS_ARGS)$$tags$$unique" \
 	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
 	     $$tags $$unique
@@ -502,6 +503,10 @@ dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
+dist-lzma: distdir
+	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
+	$(am__remove_distdir)
+
 dist-tarZ: distdir
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__remove_distdir)
@@ -528,6 +533,8 @@ distcheck: dist
 	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
 	*.tar.bz2*) \
 	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
+	*.tar.lzma*) \
+	  unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\
 	*.tar.Z*) \
 	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
 	*.shar.gz*) \
@@ -683,8 +690,8 @@ uninstall-am: uninstall-asirPROGRAMS
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-asirPROGRAMS \
 	clean-generic ctags ctags-recursive dist dist-all dist-bzip2 \
-	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-compile distclean-generic distclean-tags \
+	dist-gzip dist-lzma dist-shar dist-tarZ dist-zip distcheck \
+	distclean distclean-compile distclean-generic distclean-tags \
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-asirPROGRAMS \
 	install-data install-data-am install-dvi install-dvi-am \
@@ -702,7 +709,7 @@ uninstall-am: uninstall-asirPROGRAMS
 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}; \
@@ -711,19 +718,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) ; \
@@ -734,22 +733,16 @@ 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}