linker: privatize prio_heap and babeltrace_types

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 723bb06d1c6db208729a028107d1d58a7fa48554..7ffb164657d42004bff9da3a49591e622fecb6f2 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,5 @@ libbabeltrace_la_SOURCES = babeltrace.c \
 
 libbabeltrace_la_LDFLAGS = \
        -Wl,--no-as-needed \
 
 libbabeltrace_la_LDFLAGS = \
        -Wl,--no-as-needed \

+       prio_heap/libprio_heap.la \

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

-
-libbabeltrace_la_LIBADD = \
-       prio_heap/libprio_heap.la

diff --git a/lib/prio_heap/Makefile.am b/lib/prio_heap/Makefile.am
index 95613054c480cc0ef172a9cda35ea6656421e17d..fffa43df9ffe65619c1cfd2aa282d671d174de0d 100644 (file)
--- a/lib/prio_heap/Makefile.am
+++ b/lib/prio_heap/Makefile.am
@@ -1,5 +1,5 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 

-lib_LTLIBRARIES = libprio_heap.la
+noinst_LTLIBRARIES = libprio_heap.la

 
 libprio_heap_la_SOURCES = prio_heap.c
 
 libprio_heap_la_SOURCES = prio_heap.c

diff --git a/types/Makefile.am b/types/Makefile.am
index 2113191071c45f0de08d0f5a4a8226720aec1059..0417519642248cbd5d91ae9f9816c4308913e7e6 100644 (file)
--- a/types/Makefile.am
+++ b/types/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 

-lib_LTLIBRARIES = libbabeltrace_types.la
+noinst_LTLIBRARIES = libbabeltrace_types.la

 
 libbabeltrace_types_la_SOURCES = \
        array.c \
 
 libbabeltrace_types_la_SOURCES = \
        array.c \