X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=39b956a98a6ab4907c6ba42c2c07c44560c3bc8f;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=f8324a923b24446b70a320893bb5e402b08f9c03;hpb=6764ed54802782af3565686fc28ae1e17b9fa75a;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f8324a92..39b956a9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,33 +1,26 @@
-SUBDIRS = prio_heap .
+SUBDIRS = trace-ir prio_heap plugin graph
 
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+lib_LTLIBRARIES = libbabeltrace2.la
 
-lib_LTLIBRARIES = libbabeltrace.la
+libbabeltrace2_la_SOURCES = \
+	babeltrace2.c \
+	value.c \
+	util.c \
+	lib-logging.c \
+	logging.c \
+	object-pool.c
+libbabeltrace2_la_LDFLAGS = $(LT_NO_UNDEFINED) \
+			-version-info $(BABELTRACE_LIBRARY_VERSION)
 
-libbabeltrace_la_SOURCES = babeltrace.c \
-			   iterator.c \
-			   context.c \
-			   trace-handle.c \
-			   trace-collection.c \
-			   registry.c \
-			   values.c \
-			   ref.c
-
-libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION)
-
-if ENABLE_DEBUGINFO
-noinst_LTLIBRARIES = libdebuginfo.la
-
-libdebuginfo_la_SOURCES = debuginfo.c \
-			  so-info.c \
-			  dwarf.c \
-			  crc32.c \
-			  utils.c
-libdebuginfo_la_LDFLAGS = -lelf -ldw
-libdebuginfo_la_LIBADD = libbabeltrace.la
-endif
-
-libbabeltrace_la_LIBADD = \
+libbabeltrace2_la_LIBADD = \
 	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la \
+	graph/libgraph.la \
+	plugin/libplugin.la \
+	trace-ir/libtrace-ir.la \
+	$(top_builddir)/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/common/libbabeltrace2-common.la \
 	$(top_builddir)/compat/libcompat.la
+
+if ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT
+libbabeltrace2_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace2-python-plugin-provider.la
+endif