===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v
retrieving revision 1.12
retrieving revision 1.16
diff -u -p -r1.12 -r1.16
--- OpenXM_contrib2/asir2000/Makefile.in	2003/03/17 14:33:46	1.12
+++ OpenXM_contrib2/asir2000/Makefile.in	2003/03/20 05:07:59	1.16
@@ -78,6 +78,7 @@ PACKAGE = @PACKAGE@
 PARIINC = @PARIINC@
 PARILIB = @PARILIB@
 RANLIB = @RANLIB@
+USE_GC_ZEROPAGE = @USE_GC_ZEROPAGE@
 VERSION = @VERSION@
 XPMLIB = @XPMLIB@
 X_CFLAGS = @X_CFLAGS@
@@ -112,43 +113,24 @@ FLIB = fft/libdft.a
 IOLIB = io/libio.a
 PLIB = parse/libparse.a
 
-# The ASIRLIB cannot be rearrenged.
 ASIRLIB = ${BLIB} ${PLIB} ${IOLIB} ${PLLIB} ${ELIB} ${FLIB} ${ALIB}
 LIBS = @LIBS@ @PARILIB@ @MPILIB@ @LAPACKLIB@ ${X11LIB} ${FEPLIB} -lm ${EXTRALIBS}
 
 # EXTRALIBS = @EXTRALIBS@
 bin_PROGRAMS = asir
 asir_SOURCES = parse/main.c
-asir_LDADD = ${ASIRLIB} ${GLIB}
-noinst_LIBRARIES = libasir.a libasir-gc.a
+asir_LDADD = libasir.a libasir-gc.a
 CLEANFILES = libasir.a libasir-gc.a asir${EXEEXT}
-
-libasir_gc_a_SOURCES = 
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
-
-libasir_gc_a_AR = $(AR) cru
-libasir_gc_a_LIBADD =
-am_libasir_gc_a_OBJECTS =
-libasir_gc_a_OBJECTS = $(am_libasir_gc_a_OBJECTS)
-libasir_a_AR = $(AR) cru
-libasir_a_LIBADD =
-libasir_a_SOURCES = libasir.a.c
-libasir_a_OBJECTS = libasir.a.$(OBJEXT)
 bin_PROGRAMS = asir$(EXEEXT)
 PROGRAMS = $(bin_PROGRAMS)
 
 am_asir_OBJECTS = main.$(OBJEXT)
 asir_OBJECTS = $(am_asir_OBJECTS)
-@USE_PLOT_TRUE@asir_DEPENDENCIES = builtin/libfunc.a parse/libparse.a \
-@USE_PLOT_TRUE@	io/libio.a plot/libplot.a engine/libca.a \
-@USE_PLOT_TRUE@	fft/libdft.a asm/libasm.a libasir-gc.a
-@USE_PLOT_FALSE@asir_DEPENDENCIES = builtin/libfunc.a parse/libparse.a \
-@USE_PLOT_FALSE@	io/libio.a engine/libca.a fft/libdft.a \
-@USE_PLOT_FALSE@	asm/libasm.a libasir-gc.a
+asir_DEPENDENCIES = libasir.a libasir-gc.a
 asir_LDFLAGS =
 DEFAULT_INCLUDES =  -I. -I$(srcdir)
 CPPFLAGS = @CPPFLAGS@
@@ -159,7 +141,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 CFLAGS = @CFLAGS@
-DIST_SOURCES = $(libasir_gc_a_SOURCES) libasir.a.c $(asir_SOURCES)
+DIST_SOURCES = $(asir_SOURCES)
 
 RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
 	uninstall-info-recursive all-recursive install-data-recursive \
@@ -169,7 +151,7 @@ DIST_COMMON = INSTALL Makefile.am Makefile.in acinclud
 	config.guess config.sub configure configure.in depcomp \
 	install-sh missing mkinstalldirs
 DIST_SUBDIRS = asm builtin engine fft include io lib parse plot
-SOURCES = $(libasir_gc_a_SOURCES) libasir.a.c $(asir_SOURCES)
+SOURCES = $(asir_SOURCES)
 
 all: all-recursive
 
@@ -190,11 +172,6 @@ $(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/
 
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-AR = ar
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -415,7 +392,7 @@ distcheck: dist
 	  sed 'h;s/./=/g;p;x;p;x'
 check-am: all-am
 check: check-recursive
-all-am: Makefile $(LIBRARIES) $(PROGRAMS)
+all-am: Makefile $(PROGRAMS)
 installdirs: installdirs-recursive
 installdirs-am:
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
@@ -446,8 +423,7 @@ maintainer-clean-generic:
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
-	mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
 dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -490,35 +466,45 @@ uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 uninstall-info: uninstall-info-recursive
 
 .PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-noinstLIBRARIES \
-	clean-recursive dist dist-all distcheck distclean \
-	distclean-compile distclean-generic distclean-recursive \
-	distclean-tags distdir dvi dvi-am dvi-recursive info info-am \
-	info-recursive install install-am install-binPROGRAMS \
-	install-data install-data-am install-data-recursive \
-	install-exec install-exec-am install-exec-recursive \
-	install-info install-info-am install-info-recursive install-man \
-	install-recursive install-strip installcheck installcheck-am \
-	installdirs installdirs-am installdirs-recursive \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-recursive mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-recursive tags tags-recursive \
-	uninstall uninstall-am uninstall-binPROGRAMS uninstall-info-am \
+	clean-binPROGRAMS clean-generic clean-recursive dist dist-all \
+	distcheck distclean distclean-compile distclean-generic \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-binPROGRAMS install-data install-data-am \
+	install-data-recursive install-exec install-exec-am \
+	install-exec-recursive install-info install-info-am \
+	install-info-recursive install-man install-recursive \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am installdirs-recursive maintainer-clean \
+	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+	mostlyclean-compile mostlyclean-generic mostlyclean-recursive \
+	tags tags-recursive uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am \
 	uninstall-info-recursive uninstall-recursive
 
 
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
-libasir-gc.a: parse/gc_risa.o
+libasir-gc.a: parse/gc_risa.c
+	-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 [ ! -f ${top_srcdir}/gc/.configure_done ]; then \
-	    (cd ${top_srcdir}/gc; ./configure --disable-threads) ; \
+	    if [ -n "${host_alias}" ]; then \
+	        (cd ${top_srcdir}/gc; ./configure --host=${host_alias} --disable-threads) ; \
+	    else \
+	        (cd ${top_srcdir}/gc; ./configure --disable-threads) ; \
+	    fi ; \
 	    touch ${top_srcdir}/gc/.configure_done ; \
 	fi
 	(cd ${top_srcdir}/gc; ${MAKE})
-	cp ${top_srcdir}/gc/.libs/libgc.a ${top_srcdir}/${GLIB}
-	${AR} q ${top_srcdir}/${GLIB} ${top_srcdir}/parse/gc_risa.o
-	${RANLIB} ${top_srcdir}/${GLIB}
+	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}
 
 libasir.a: ${ASIRLIB}
 	-mkdir ${top_srcdir}/libtmp