=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/Makefile.in,v retrieving revision 1.10 retrieving revision 1.14 diff -u -p -r1.10 -r1.14 --- OpenXM_contrib2/asir2000/Makefile.in 2003/03/12 08:25:52 1.10 +++ OpenXM_contrib2/asir2000/Makefile.in 2003/03/19 07:12:02 1.14 @@ -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,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@ @@ -92,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@ -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} @@ -173,20 +176,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 @@ -509,8 +512,17 @@ umain.o: parse/main.c ${COMPILE} -DUINIT main.c -o umain.o libasir-gc.a: parse/gc_risa.o + -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})