From 785fad0ad840db2ec95b035f4216e5ff443b2241 Mon Sep 17 00:00:00 2001 From: Matthias Klose Date: Fri, 18 Jul 2008 08:15:27 +0000 Subject: configure.ac (AC_CONFIG_FILES): Add threads.mk. 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. From-SVN: r137939 --- libobjc/ChangeLog | 5 +++++ libobjc/Makefile.in | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'libobjc') 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 + + * Makefile.in: Include ../boehm-gc/threads.mk. + (OBJC_BOEHM_GC_LIBS): Define, (libobjc_gc$(libsuffix).la): Use it. + 2008-07-06 Ralf Wildenhues * 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) -- cgit v1.1