X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=6a35b8f8d2c3766b90f252158c2e86be90349d70;hb=c3ddb532606565c9526c20703b5c70171031c558;hp=86423fdf5e4750b0a0788951135e877aaf188384;hpb=d5ddf820bf2640c74a0581d408b48e9edf8b1984;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 86423fdf..6a35b8f8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,33 +1,26 @@
-SUBDIRS = prio_heap .
+SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph .
 
 AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
 
 lib_LTLIBRARIES = libbabeltrace.la
 
-libbabeltrace_la_SOURCES = babeltrace.c \
-			   iterator.c \
-			   context.c \
-			   trace-handle.c \
-			   trace-collection.c \
-			   registry.c \
-			   values.c \
-			   ref.c
-
+libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c
 libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION)
 
-if ENABLE_DEBUGINFO
-noinst_LTLIBRARIES = libdebuginfo.la
+libbabeltrace_la_LIBADD = \
+	prio_heap/libprio_heap.la \
+	graph/libgraph.la \
+	plugin/libplugin.la \
+	ctf-ir/libctf-ir.la \
+	ctf-writer/libctf-writer.la
 
-libdebuginfo_la_SOURCES = debuginfo.c \
-			  bin-info.c \
-			  dwarf.c \
-			  crc32.c \
-			  utils.c
-libdebuginfo_la_LDFLAGS = -lelf -ldw
-libdebuginfo_la_LIBADD = libbabeltrace.la
+if BUILT_IN_PYTHON_PLUGIN_SUPPORT
+libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la
 endif
 
-libbabeltrace_la_LIBADD = \
-	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la \
+if !BUILT_IN_PLUGINS
+libbabeltrace_la_LIBADD += \
+	$(top_builddir)/logging/libbabeltrace-logging.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
 	$(top_builddir)/compat/libcompat.la
+endif