From e5aa6a0ae6d2a609569f58c8cf5d203f8ed7d832 Mon Sep 17 00:00:00 2001 From: Kelley Cook Date: Tue, 1 Mar 2005 23:25:50 +0000 Subject: [PATCH] Makefile.in, [...]: Regenerate. 2005-03-01 Kelley Cook * Makefile.in, include/Makefile.in: Regenerate. From-SVN: r95762 --- boehm-gc/ChangeLog | 4 ++++ boehm-gc/Makefile.in | 5 +++-- boehm-gc/include/Makefile.in | 29 ++++++++++++++++++++--------- 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index cb49b3a8d54..9b5852d4777 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,7 @@ +2005-03-01 Kelley Cook + + * Makefile.in, include/Makefile.in: Regenerate. + 2005-02-26 Richard Earnshaw * dyn_load.c: On NetBSD, include machine/elf_machdep.h and define diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index a81e3d0b466..6f842205efe 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/Makefile.in @@ -77,7 +77,8 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno -CONFIG_HEADER = $(top_builddir)/include/gc_config.h +CONFIG_HEADER = $(top_builddir)/include/gc_config.h \ + $(top_builddir)/include/gc_ext_config.h CONFIG_CLEAN_FILES = LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = @@ -100,7 +101,7 @@ am_gctest_OBJECTS = tests/test.$(OBJEXT) gctest_OBJECTS = $(am_gctest_OBJECTS) gctest_DEPENDENCIES = ./libgcjgc.la $(am__DEPENDENCIES_1) \ $(am__DEPENDENCIES_1) -DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include +DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_builddir)/include depcomp = am__depfiles_maybe = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff --git a/boehm-gc/include/Makefile.in b/boehm-gc/include/Makefile.in index 66aacac205a..4c823287b32 100644 --- a/boehm-gc/include/Makefile.in +++ b/boehm-gc/include/Makefile.in @@ -39,14 +39,15 @@ host_triplet = @host@ target_triplet = @target@ subdir = include DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/gc_config.h.in + $(srcdir)/Makefile.in $(srcdir)/gc_config.h.in \ + $(srcdir)/gc_ext_config.h.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ $(top_srcdir)/../config/no-executables.m4 \ $(top_srcdir)/../libtool.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) -CONFIG_HEADER = gc_config.h +CONFIG_HEADER = gc_config.h gc_ext_config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = @@ -179,7 +180,7 @@ AUTOMAKE_OPTIONS = foreign noinst_HEADERS = gc.h gc_backptr.h gc_local_alloc.h \ gc_pthread_redirects.h gc_cpp.h -all: gc_config.h +all: gc_config.h gc_ext_config.h $(MAKE) $(AM_MAKEFLAGS) all-am .SUFFIXES: @@ -227,8 +228,18 @@ $(srcdir)/gc_config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) rm -f stamp-h1 touch $@ +gc_ext_config.h: stamp-h2 + @if test ! -f $@; then \ + rm -f stamp-h2; \ + $(MAKE) stamp-h2; \ + else :; fi + +stamp-h2: $(srcdir)/gc_ext_config.h.in $(top_builddir)/config.status + @rm -f stamp-h2 + cd $(top_builddir) && $(SHELL) ./config.status include/gc_ext_config.h + distclean-hdr: - -rm -f gc_config.h stamp-h1 + -rm -f gc_config.h stamp-h1 gc_ext_config.h stamp-h2 mostlyclean-libtool: -rm -f *.lo @@ -250,11 +261,11 @@ ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) mkid -fID $$unique tags: TAGS -TAGS: $(HEADERS) $(SOURCES) gc_config.h.in $(TAGS_DEPENDENCIES) \ +TAGS: $(HEADERS) $(SOURCES) gc_config.h.in gc_ext_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) gc_config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) gc_config.h.in gc_ext_config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -266,11 +277,11 @@ TAGS: $(HEADERS) $(SOURCES) gc_config.h.in $(TAGS_DEPENDENCIES) \ $$tags $$unique; \ fi ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) gc_config.h.in $(TAGS_DEPENDENCIES) \ +CTAGS: $(HEADERS) $(SOURCES) gc_config.h.in gc_ext_config.h.in $(TAGS_DEPENDENCIES) \ $(TAGS_FILES) $(LISP) tags=; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) gc_config.h.in $(LISP) $(TAGS_FILES)'; \ + list='$(SOURCES) $(HEADERS) gc_config.h.in gc_ext_config.h.in $(LISP) $(TAGS_FILES)'; \ unique=`for i in $$list; do \ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ done | \ @@ -317,7 +328,7 @@ distdir: $(DISTFILES) done check-am: all-am check: check-am -all-am: Makefile $(HEADERS) gc_config.h +all-am: Makefile $(HEADERS) gc_config.h gc_ext_config.h installdirs: install: install-am install-exec: install-exec-am