diff options
| -rw-r--r-- | boehm-gc/ChangeLog | 6 | ||||
| -rw-r--r-- | boehm-gc/Makefile.in | 10 | ||||
| -rwxr-xr-x | boehm-gc/configure | 3 | ||||
| -rw-r--r-- | boehm-gc/configure.ac | 2 | ||||
| -rw-r--r-- | libobjc/ChangeLog | 5 | ||||
| -rw-r--r-- | libobjc/Makefile.in | 5 |
6 files changed, 24 insertions, 7 deletions
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index d6d3767..a7eeec0 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,9 @@ +2008-07-18 Matthias Klose <doko@ubuntu.com> + + * configure.ac (AC_CONFIG_FILES): Add threads.mk. + * threads.mk.in: New. + * Makefile.in, configure: Regenerate. + 2008-06-17 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in: Regenerate. diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in index 91918f2..e3a2e30 100644 --- a/boehm-gc/Makefile.in +++ b/boehm-gc/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/boehm-gc/configure b/boehm-gc/configure index 97cb191..5308c77 100755 --- a/boehm-gc/configure +++ b/boehm-gc/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/boehm-gc/configure.ac b/boehm-gc/configure.ac index 29331e6..326a051 100644 --- a/boehm-gc/configure.ac +++ b/boehm-gc/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 diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index aabb9fd..32b5bde 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +2008-07-18 Matthias Klose <doko@ubuntu.com> + + * Makefile.in: Include ../boehm-gc/threads.mk. + (OBJC_BOEHM_GC_LIBS): Define, (libobjc_gc$(libsuffix).la): Use it. + 2008-07-06 Ralf Wildenhues <Ralf.Wildenhues@gmx.de> * Makefile.in (install-info): New stub target. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index f9538af..130e936 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -48,6 +48,8 @@ extra_ldflags_libobjc = @extra_ldflags_libobjc@ top_builddir = . +include ../boehm-gc/threads.mk + libdir = $(exec_prefix)/lib libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version) @@ -95,6 +97,7 @@ OBJC_GCFLAGS=-DOBJC_WITH_GC=1 OBJC_THREAD_FILE=thr-objc OBJC_BOEHM_GC=@OBJC_BOEHM_GC@ OBJC_BOEHM_GC_INCLUDES=@OBJC_BOEHM_GC_INCLUDES@ +OBJC_BOEHM_GC_LIBS=../boehm-gc/libgcjgc_convenience.la $(thread_libs_and_flags) INCLUDES = -I$(srcdir)/objc -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config \ @@ -284,7 +287,7 @@ libobjc$(libsuffix).la: $(OBJS) $(LTLDFLAGS) libobjc_gc$(libsuffix).la: $(OBJS_GC) - $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \ + $(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) $(OBJC_BOEHM_GC_LIBS) \ -rpath $(toolexeclibdir) \ -version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc) \ $(LTLDFLAGS) |