===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.14
diff -u -p -r1.7 -r1.14
--- OpenXM_contrib2/asir2000/Makefile.am	2003/03/08 10:41:18	1.7
+++ OpenXM_contrib2/asir2000/Makefile.am	2003/03/20 05:07:59	1.14
@@ -1,10 +1,10 @@
-# $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.6 2003/03/07 17:18:40 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.13 2003/03/20 02:02:39 ohara Exp $
 
 AUTOMAKE_OPTIONS = foreign no-dependencies 1.5
 if USE_PLOT
     PLOTDIR = plot
     PLLIB   = plot/libplot.a
-    X11LIB  = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ -lXext -lX11 @X_EXTRA_LIBS@ 
+    X11LIB  = @X_LIBS@ -lXaw -lXmu -lXt @X_PRE_LIBS@ @XPMLIB@ -lXext -lX11 @X_EXTRA_LIBS@ 
 endif
 
 SUBDIRS  = asm builtin engine fft include io lib parse ${PLOTDIR}
@@ -22,31 +22,37 @@ 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 =
-
 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
@@ -87,6 +93,7 @@ install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
 	${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)