===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v
retrieving revision 1.10
retrieving revision 1.28
diff -u -p -r1.10 -r1.28
--- OpenXM_contrib2/asir2000/Makefile.in	2003/03/12 08:25:52	1.10
+++ OpenXM_contrib2/asir2000/Makefile.in	2007/02/18 08:46:47	1.28
@@ -70,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@
@@ -77,7 +78,11 @@ PACKAGE = @PACKAGE@
 PARIINC = @PARIINC@
 PARILIB = @PARILIB@
 RANLIB = @RANLIB@
+USE_GC_INTERIX = @USE_GC_INTERIX@
+USE_GC_SPARC64 = @USE_GC_SPARC64@
+USE_GC_ZEROPAGE = @USE_GC_ZEROPAGE@
 VERSION = @VERSION@
+XPMLIB = @XPMLIB@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
@@ -88,17 +93,29 @@ am__quote = @am__quote@
 asm_obj = @asm_obj@
 install_sh = @install_sh@
 libasir_postfix = @libasir_postfix@
+GC_DISTDIR = @GC_DISTDIR@
 
 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@ -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}
 
-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
+
+GC = gc6.8
+GC_TAR_GZ = ${GC}.tar.gz
+GC_MASTER_SITE = ftp://ftp.math.kobe-u.ac.jp/pub/OpenXM/misc/
+OX_FETCH = ${bindir}/oxfetch.sh
+
+DEFS = @DEFS@ -DASIR_LIBDIR=\"${asirdir}\"
 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/parse -I${top_srcdir}/io \
-           -I${top_srcdir}/gc/include \
+           -I${top_srcdir}/${GC}/include \
            @PARIINC@ @MPIINC@ @X_CFLAGS@
 
 
@@ -110,43 +127,18 @@ 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 = 
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
-LIBRARIES = $(noinst_LIBRARIES)
+asir_PROGRAMS = asir$(EXEEXT)
+PROGRAMS = $(asir_PROGRAMS)
 
-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@
@@ -157,7 +149,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 \
@@ -167,55 +159,50 @@ 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
 
 .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
-
-clean-noinstLIBRARIES:
-	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-install-binPROGRAMS: $(bin_PROGRAMS)
+install-asirPROGRAMS: $(asir_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	$(mkinstalldirs) $(DESTDIR)$(bindir)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	$(mkinstalldirs) $(DESTDIR)$(asirdir)
+	@list='$(asir_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
 	  ; then \
 	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
-	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/$$f; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(asirdir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$p $(DESTDIR)$(asirdir)/$$f; \
 	  else :; fi; \
 	done
 
-uninstall-binPROGRAMS:
+uninstall-asirPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	@list='$(asir_PROGRAMS)'; for p in $$list; do \
 	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
-	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
-	  rm -f $(DESTDIR)$(bindir)/$$f; \
+	  echo " rm -f $(DESTDIR)$(asirdir)/$$f"; \
+	  rm -f $(DESTDIR)$(asirdir)/$$f; \
 	done
 
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+clean-asirPROGRAMS:
+	-test -z "$(asir_PROGRAMS)" || rm -f $(asir_PROGRAMS)
 main.$(OBJEXT): parse/main.c
 asir$(EXEEXT): $(asir_OBJECTS) $(asir_DEPENDENCIES) 
 	@rm -f asir$(EXEEXT)
@@ -413,10 +400,10 @@ 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)
+	$(mkinstalldirs) $(DESTDIR)$(asirdir)
 
 install: install-recursive
 install-exec: install-exec-recursive
@@ -444,8 +431,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-asirPROGRAMS clean-generic mostlyclean-am
 
 dist-all: distdir
 	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -463,11 +449,9 @@ info: info-recursive
 
 info-am:
 
-install-data-am:
+install-data-am: install-asirPROGRAMS
 
-install-exec-am: install-binPROGRAMS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-exec-am:
 
 install-info: install-info-recursive
 
@@ -483,40 +467,72 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-uninstall-am: uninstall-binPROGRAMS uninstall-info-am
+uninstall-am: uninstall-asirPROGRAMS 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-asirPROGRAMS 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-asirPROGRAMS 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-asirPROGRAMS uninstall-info-am \
 	uninstall-info-recursive uninstall-recursive
 
+# EXTRALIBS = @EXTRALIBS@
 
 umain.o: parse/main.c
 	${COMPILE} -DUINIT main.c -o umain.o
 
-libasir-gc.a: parse/gc_risa.o
-	-if [ ! -f ${top_srcdir}/gc/.configure_done ]; then \
-	    (cd ${top_srcdir}/gc; ./configure --disable-threads) ; \
-	    touch ${top_srcdir}/gc/.configure_done ; \
+libasir-gc.a: gc6.5-risa.diff parse/gc_risa.c
+	-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}; \
+		fi ; \
+		touch ${top_srcdir}/.gc_fetch_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}
+	-if [ ! -f ${top_srcdir}/.gc_risa_done ]; then \
+	    (cd ${top_srcdir}; tar xzvf ${GC_DISTDIR}/${GC_TAR_GZ}) ; \
+	    (cd ${top_srcdir}/${GC}; patch -p1 < ../gc6.5-risa.diff) ; \
+	    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) ; \
+	    touch ${top_srcdir}/${GC}/.patch_gc_sparc64_done ; \
+	fi
+	-if [ ! -f ${top_srcdir}/${GC}/.configure_done ]; then \
+	    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 ${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
@@ -530,28 +546,24 @@ 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} ; \
@@ -561,18 +573,25 @@ install-openxm: asir${EXEEXT} libasir.a libasir-gc.a
 
 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 ${prefix}/lib/asir ; \
+	(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
-	-rm -f ${prefix}/bin/asir${EXEEXT}
-	(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
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: