X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=lib%2FMakefile.am;h=c7e368806918d71f40593c3fdec03cc9835500bc;hp=71af87a5640f25750b981db5af7e94ce215fd743;hb=1b83271bb496e994fdb6ba4047e88824ec391d43;hpb=33b34c437c354e1c065e33151135bc2e57e2e29c

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 71af87a5..c7e36880 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,35 +1,23 @@
-SUBDIRS = prio_heap plugin component .
+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_DEBUG_INFO
-noinst_LTLIBRARIES = libdebug-info.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 \
+	$(top_builddir)/logging/libbabeltrace-logging.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
+	$(top_builddir)/compat/libcompat.la
 
-libdebug_info_la_SOURCES = debug-info.c \
-			  bin-info.c \
-			  dwarf.c \
-			  crc32.c \
-			  utils.c
-libdebug_info_la_LDFLAGS = -lelf -ldw
-libdebug_info_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 \
-	$(top_builddir)/compat/libcompat.la \
-	component/libcomponent.la \
-	plugin/libplugin.la