X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=7ffb164657d42004bff9da3a49591e622fecb6f2;hp=ba24d21cb002c5788754fa6eac0d36133860145f;hb=91f361c1757256c11988ab16376419a72592e1a9;hpb=6f3077a2db5bfeb47ed75b1c7c731a5e8e60aa43

diff --git a/lib/Makefile.am b/lib/Makefile.am
index ba24d21c..7ffb1646 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,13 +1,17 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+SUBDIRS = prio_heap .
 
-lib_LTLIBRARIES = libprio_heap.la libbabeltrace.la
+AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
-libprio_heap_la_SOURCES = prio_heap.c
+lib_LTLIBRARIES = libbabeltrace.la
 
 libbabeltrace_la_SOURCES = babeltrace.c \
-			   callbacks.c \
-			   iterator.c
+			   iterator.c \
+			   context.c \
+			   trace-handle.c \
+			   trace-collection.c \
+			   registry.c
 
-libbabeltrace_la_LIBADD = \
-	$(top_builddir)/types/libbabeltrace_types.la \
-	$(top_builddir)/lib/libprio_heap.la
+libbabeltrace_la_LDFLAGS = \
+	-Wl,--no-as-needed \
+	prio_heap/libprio_heap.la \
+	$(top_builddir)/types/libbabeltrace_types.la