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 f688e1f5094640df4d1b6118f5da4f8b54f533bb..71796f9c75b0bed3d5cd9da41d6a07225d1a9f85 100644 (file)
--- 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
        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 0725dce3d826bfba62a1249d790570b059907391..21ae12aaba1af7d2abd09bb5cb154b598a2ed1d8 100644 (file)
--- 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 = \
                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
 
 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 76544b3c8f323f0a8b9db500a804e56798b1399d..20c1fdd0540fdfaea41a365847fc330eb6c6d58f 100644 (file)
--- 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
        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 db6db39830c66d480d96faa16f5a2934833d0202..723bb06d1c6db208729a028107d1d58a7fa48554 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -11,6 +11,9 @@ libbabeltrace_la_SOURCES = babeltrace.c \
                           trace-collection.c \
                           registry.c
 
                           trace-collection.c \
                           registry.c
 

+libbabeltrace_la_LDFLAGS = \
+       -Wl,--no-as-needed \
+       $(top_builddir)/types/libbabeltrace_types.la
+

 libbabeltrace_la_LIBADD = \
 libbabeltrace_la_LIBADD = \

-       $(top_builddir)/types/libbabeltrace_types.la \

        prio_heap/libprio_heap.la
        prio_heap/libprio_heap.la