From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 23 Feb 2012 18:39:16 +0000 (-0500)
Subject: Linker: privatize libbabeltrace_types
X-Git-Tag: v1.0.0-pre2~2
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=76863fd6cdec274450a6fd640fc70ea7398c4510

Linker: privatize libbabeltrace_types

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

diff --git a/formats/ctf-text/types/Makefile.am b/formats/ctf-text/types/Makefile.am
index f688e1f5..71796f9c 100644
--- a/formats/ctf-text/types/Makefile.am
+++ b/formats/ctf-text/types/Makefile.am
@@ -11,3 +11,6 @@ libctf_text_types_la_SOURCES = \
 	string.c \
 	struct.c \
 	variant.c
+
+libctf_text_types_la_LIBADD = \
+	$(top_builddir)/lib/libbabeltrace.la
diff --git a/formats/ctf/metadata/Makefile.am b/formats/ctf/metadata/Makefile.am
index 0725dce3..21ae12aa 100644
--- a/formats/ctf/metadata/Makefile.am
+++ b/formats/ctf/metadata/Makefile.am
@@ -16,7 +16,7 @@ libctf_ast_la_SOURCES = ctf-visitor-xml.c \
 		ctf-visitor-generate-io-struct.c
 
 libctf_ast_la_LIBADD = \
-		 $(top_builddir)/types/libbabeltrace_types.la
+	$(top_builddir)/lib/libbabeltrace.la
 
 noinst_PROGRAMS = ctf-parser-test
 ctf_parser_test_SOURCES = ctf-parser-test.c
diff --git a/formats/ctf/types/Makefile.am b/formats/ctf/types/Makefile.am
index 76544b3c..20c1fdd0 100644
--- a/formats/ctf/types/Makefile.am
+++ b/formats/ctf/types/Makefile.am
@@ -11,3 +11,6 @@ libctf_types_la_SOURCES = \
 	string.c \
 	struct.c \
 	variant.c
+
+libctf_types_la_LIBADD = \
+	$(top_builddir)/lib/libbabeltrace.la
diff --git a/lib/Makefile.am b/lib/Makefile.am
index db6db398..723bb06d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,6 +11,9 @@ libbabeltrace_la_SOURCES = babeltrace.c \
 			   trace-collection.c \
 			   registry.c
 
+libbabeltrace_la_LDFLAGS = \
+	-Wl,--no-as-needed \
+	$(top_builddir)/types/libbabeltrace_types.la
+
 libbabeltrace_la_LIBADD = \
-	$(top_builddir)/types/libbabeltrace_types.la \
 	prio_heap/libprio_heap.la