aboutsummaryrefslogtreecommitdiff
path: root/libobjc/Makefile.in
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2008-07-18 08:15:27 +0000
committerMatthias Klose <doko@gcc.gnu.org>2008-07-18 08:15:27 +0000
commit785fad0ad840db2ec95b035f4216e5ff443b2241 (patch)
treeeac764c9f401c3839e3baefd9b522cc888310b89 /libobjc/Makefile.in
parentc55cffb5558986ddf4fcd2dfbd4c73a2eaad5b6e (diff)
downloadgcc-785fad0ad840db2ec95b035f4216e5ff443b2241.zip
gcc-785fad0ad840db2ec95b035f4216e5ff443b2241.tar.gz
gcc-785fad0ad840db2ec95b035f4216e5ff443b2241.tar.bz2
configure.ac (AC_CONFIG_FILES): Add threads.mk.
boehm-gc/ 2008-07-18 Matthias Klose <doko@ubuntu.com> * configure.ac (AC_CONFIG_FILES): Add threads.mk. * threads.mk.in: New. * Makefile.in, configure: Regenerate. libobjc/ 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. From-SVN: r137939
Diffstat (limited to 'libobjc/Makefile.in')
-rw-r--r--libobjc/Makefile.in5
1 files changed, 4 insertions, 1 deletions
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)