From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Thu, 23 Feb 2012 18:53:28 +0000 (-0500)
Subject: linker: privatize prio_heap and babeltrace_types
X-Git-Tag: v1.0.0-pre2~1
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=018f3175330093bae1c35ed2e571c8181254c545

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 723bb06d..7ffb1646 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -13,7 +13,5 @@ libbabeltrace_la_SOURCES = babeltrace.c \
 
 libbabeltrace_la_LDFLAGS = \
 	-Wl,--no-as-needed \
+	prio_heap/libprio_heap.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 95613054..fffa43df 100644
--- a/lib/prio_heap/Makefile.am
+++ b/lib/prio_heap/Makefile.am
@@ -1,5 +1,5 @@
 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
diff --git a/types/Makefile.am b/types/Makefile.am
index 21131910..04175196 100644
--- a/types/Makefile.am
+++ b/types/Makefile.am
@@ -1,6 +1,6 @@
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
-lib_LTLIBRARIES = libbabeltrace_types.la
+noinst_LTLIBRARIES = libbabeltrace_types.la
 
 libbabeltrace_types_la_SOURCES = \
 	array.c \