===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v
retrieving revision 1.6
retrieving revision 1.15
diff -u -p -r1.6 -r1.15
--- OpenXM_contrib2/asir2000/Makefile.in	2003/03/07 17:00:45	1.6
+++ OpenXM_contrib2/asir2000/Makefile.in	2003/03/20 02:02:39	1.15
@@ -13,8 +13,6 @@
 
 @SET_MAKE@
 
-# $OpenXM: OpenXM_contrib2/asir2000/Makefile.in,v 1.5 2003/03/07 15:55:05 ohara Exp $
-
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -72,6 +70,7 @@ FEPLIB = @FEPLIB@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LAPACKLIB = @LAPACKLIB@
 LN_S = @LN_S@
+MAINT = @MAINT@
 MPIINC = @MPIINC@
 MPILIB = @MPILIB@
 OBJEXT = @OBJEXT@
@@ -79,7 +78,9 @@ PACKAGE = @PACKAGE@
 PARIINC = @PARIINC@
 PARILIB = @PARILIB@
 RANLIB = @RANLIB@
+USE_GC_ZEROPAGE = @USE_GC_ZEROPAGE@
 VERSION = @VERSION@
+XPMLIB = @XPMLIB@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -94,7 +95,7 @@ libasir_postfix = @libasir_postfix@
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 @USE_PLOT_TRUE@PLOTDIR = plot
 @USE_PLOT_TRUE@PLLIB = plot/libplot.a
-@USE_PLOT_TRUE@X11LIB = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ -lXpm -lXext -lX11 @X_EXTRA_LIBS@ 
+@USE_PLOT_TRUE@X11LIB = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ @XPMLIB@ -lXext -lX11 @X_EXTRA_LIBS@ 
 
 SUBDIRS = asm builtin engine fft include io lib parse ${PLOTDIR}
 
@@ -112,14 +113,13 @@ 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}
+asir_LDADD = libasir.a libasir-gc.a
 noinst_LIBRARIES = libasir.a libasir-gc.a
 CLEANFILES = libasir.a libasir-gc.a asir${EXEEXT}
 
@@ -143,12 +143,7 @@ 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@
@@ -175,20 +170,20 @@ all: all-recursive
 
 .SUFFIXES:
 .SUFFIXES: .c .o .obj
-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 	cd $(top_srcdir) && \
 	  $(AUTOMAKE) --foreign  Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
 	cd $(top_builddir) && \
 	  CONFIG_HEADERS= CONFIG_LINKS= \
 	  CONFIG_FILES=$@ $(SHELL) ./config.status
 
 $(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-$(ACLOCAL_M4):  configure.in acinclude.m4
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in acinclude.m4
 	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
 
 AR = ar
@@ -510,15 +505,25 @@ uninstall-info: uninstall-info-recursive
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
-libasir-gc.a: parse/gc_risa.o
+libasir-gc.a:
+	-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
@@ -558,14 +563,19 @@ install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
 	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
+	(cd ${top_srcdir}/include; ${MAKE} install)
+	(cd ${top_srcdir}/parse; ${MAKE} install)
 
 install-lib:
 	(cd ${top_srcdir}/lib; ${MAKE} install-lib)
+	-(cd ${prefix}/lib/asir; \
+	rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
 	(cd ${prefix}/lib/asir ; \
 	${LN_S} asir${EXEEXT} ox_asir${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_launch${EXEEXT} ; \
 	${LN_S} asir${EXEEXT} ox_plot${EXEEXT})
 	-mkdir -p ${prefix}/bin
+	-rm -f ${prefix}/bin/asir${EXEEXT}
 	(cd ${prefix}/bin ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
 
 install-doc: