===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.20
diff -u -p -r1.5 -r1.20
--- OpenXM_contrib2/asir2000/Makefile.am	2003/03/07 17:00:45	1.5
+++ OpenXM_contrib2/asir2000/Makefile.am	2004/06/25 13:41:33	1.20
@@ -1,15 +1,21 @@
-# $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.4 2003/03/07 15:55:05 ohara Exp $
+## $OpenXM: OpenXM_contrib2/asir2000/Makefile.am,v 1.19 2004/02/27 18:32:21 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@ -lXpm -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}
 
-DEFS     = @DEFS@ -DASIR_LIBDIR=\"${prefix}/lib/asir\"
+asirdir       = ${libdir}/asir
+asir_PROGRAMS = asir
+asir_SOURCES  = parse/main.c
+asir_LDADD    = libasir.a libasir-gc.a
+CLEANFILES    = ${asir_LDADD} asir-openxm-${VERSION}.tgz
+
+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@
@@ -22,31 +28,42 @@ 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
-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 [ "${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) ; \
+	    touch ${top_srcdir}/gc/.patch_gc_sparc64_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
@@ -60,41 +77,49 @@ libasir.a: ${ASIRLIB}
 #	-rm $@
 #	ld -r $@ umain.o ${ASIRLIB} ${GLIB} ${LIBS} ${EXTRALIBS}
 
-install-exec-hook:
-	-mkdir -p ${prefix}/lib/asir
-	-if [ -x ${prefix}/bin/asir ]; then \
-		mv ${prefix}/bin/asir${EXEEXT} ${prefix}/lib/asir/ ; \
-	fi
-
 install-libasir: libasir.a
-	mkdir -p ${prefix}/lib
-	${INSTALL_DATA} libasir.a ${prefix}/lib/libasir${libasir_postfix}.a
+	mkdir -p ${DESTDIR}${libdir}
+	${INSTALL_DATA} libasir.a ${DESTDIR}${libdir}/libasir${libasir_postfix}.a
 
-install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
-	-mkdir -p ${prefix}/bin
-	${INSTALL_PROGRAM} asir ${prefix}/bin/
-	-mkdir -p ${prefix}/lib/asir
+install-libasir-gc: libasir-gc.a
+	mkdir -p ${DESTDIR}${libdir}
+	${INSTALL_DATA} libasir-gc.a ${DESTDIR}${libdir}/libasir-gc.a
+
+install-openxm: asir${EXEEXT} install-libasir install-libasir-gc
+	-mkdir -p ${DESTDIR}${bindir}
+	${INSTALL_PROGRAM} asir ${DESTDIR}${bindir}
+	-mkdir -p ${DESTDIR}${asirdir}
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc install-lib)
-	${INSTALL_DATA} libasir.a    ${prefix}/lib/libasir${libasir_postfix}.a
-	${INSTALL_DATA} libasir-gc.a ${prefix}/lib/libasir-gc.a
-	-rm -f ${prefix}/bin/ox_asir${EXEEXT}
-	(cd ${prefix}/bin ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
-	-(cd ${prefix}/lib/asir; \
+	-rm -f ${DESTDIR}${bindir}/ox_asir${EXEEXT}
+	(cd ${DESTDIR}${bindir} ; ${LN_S} asir${EXEEXT} ox_asir${EXEEXT})
+	-(cd ${DESTDIR}${asirdir}; \
     rm -f asir${EXEEXT} ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
-	(cd ${prefix}/lib/asir ; \
+	(cd ${DESTDIR}${asirdir} ; \
 	${LN_S} ../../bin/asir${EXEEXT} asir${EXEEXT} ; \
 	${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 ; \
+	-(cd ${DESTDIR}${asirdir}; \
+	rm -f ox_asir${EXEEXT} ox_launch${EXEEXT} ox_plot${EXEEXT})
+	(cd ${DESTDIR}${asirdir} ; \
 	${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
-	(cd ${prefix}/bin ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
+	-mkdir -p ${DESTDIR}${bindir}
+	-rm -f ${DESTDIR}${bindir}/asir${EXEEXT}
+	(cd ${DESTDIR}${bindir} ; ${LN_S} ../lib/asir/asir${EXEEXT} asir${EXEEXT})
 
 install-doc:
 	(cd ${top_srcdir}/lib; ${MAKE} install-doc)
+
+tarball:
+	-rm -rf tmp
+	-mkdir tmp
+	DESTDIR=`cd tmp; pwd` ${MAKE} install-openxm
+	(cd tmp${prefix}; tar cf - * ) | gzip -c > asir-openxm-${VERSION}.tgz
+	-rm -rf tmp