From 52110a816292a3a96e428d044008a19a254b46fa Mon Sep 17 00:00:00 2001 From: doko Date: Fri, 18 Jul 2008 08:15:27 +0000 Subject: [PATCH] boehm-gc/ 2008-07-18 Matthias Klose * configure.ac (AC_CONFIG_FILES): Add threads.mk. * threads.mk.in: New. * Makefile.in, configure: Regenerate. libobjc/ 2008-07-18 Matthias Klose * Makefile.in: Include ../boehm-gc/threads.mk. (OBJC_BOEHM_GC_LIBS): Define, (libobjc_gc$(libsuffix).la): Use it. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@137939 138bc75d-0d04-0410-961f-82ee72b054a4 --- ChangeLog | 6 ++++++ Makefile.in | 10 ++++++---- configure | 3 ++- configure.ac | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d6d37671..a7eeec05 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-07-18 Matthias Klose + + * configure.ac (AC_CONFIG_FILES): Add threads.mk. + * threads.mk.in: New. + * Makefile.in, configure: Regenerate. + 2008-06-17 Ralf Wildenhues * Makefile.in: Regenerate. diff --git a/Makefile.in b/Makefile.in index 91918f20..e3a2e301 100644 --- a/Makefile.in +++ b/Makefile.in @@ -41,7 +41,7 @@ check_PROGRAMS = gctest$(EXEEXT) DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \ ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/../mkinstalldirs $(srcdir)/../compile \ + $(srcdir)/../mkinstalldirs $(srcdir)/threads.mk.in \ $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ @@ -62,8 +62,8 @@ DIST_COMMON = $(srcdir)/../config.guess $(srcdir)/../config.sub \ $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ $(srcdir)/../compile $(srcdir)/../compile $(srcdir)/../compile \ - $(srcdir)/../ltmain.sh $(srcdir)/../config.guess \ - $(srcdir)/../config.sub + $(srcdir)/../compile $(srcdir)/../ltmain.sh \ + $(srcdir)/../config.guess $(srcdir)/../config.sub subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../config/acx.m4 \ @@ -82,7 +82,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno configure.status.lineno CONFIG_HEADER = $(top_builddir)/include/gc_config.h \ $(top_builddir)/include/gc_ext_config.h -CONFIG_CLEAN_FILES = +CONFIG_CLEAN_FILES = threads.mk LTLIBRARIES = $(noinst_LTLIBRARIES) am__DEPENDENCIES_1 = @POWERPC_DARWIN_TRUE@am__objects_1 = powerpc_darwin_mach_dep.lo @@ -387,6 +387,8 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) cd $(srcdir) && $(AUTOCONF) $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +threads.mk: $(top_builddir)/config.status $(srcdir)/threads.mk.in + cd $(top_builddir) && $(SHELL) ./config.status $@ clean-noinstLTLIBRARIES: -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) diff --git a/configure b/configure index 97cb1913..5308c770 100755 --- a/configure +++ b/configure @@ -16103,7 +16103,7 @@ fi ac_config_headers="$ac_config_headers include/gc_config.h include/gc_ext_config.h" - ac_config_files="$ac_config_files Makefile include/Makefile" + ac_config_files="$ac_config_files Makefile include/Makefile threads.mk" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -17035,6 +17035,7 @@ do # Handling of arguments. "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; + "threads.mk" ) CONFIG_FILES="$CONFIG_FILES threads.mk" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; "libtool" ) CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; diff --git a/configure.ac b/configure.ac index 29331e60..326a051f 100644 --- a/configure.ac +++ b/configure.ac @@ -547,5 +547,5 @@ fi AC_CONFIG_HEADERS([include/gc_config.h include/gc_ext_config.h]) -AC_CONFIG_FILES(Makefile include/Makefile) +AC_CONFIG_FILES(Makefile include/Makefile threads.mk) AC_OUTPUT -- 2.40.0