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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0ba33f39..6a35b8f8 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,40 +1,26 @@
-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
-
-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
-endif
-
 libbabeltrace_la_LIBADD = \
 	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la \
-	$(top_builddir)/compat/libcompat.la \
-	component/libcomponent.la \
+	graph/libgraph.la \
 	plugin/libplugin.la \
-	$(top_builddir)/common/libbabeltrace-common.la
+	ctf-ir/libctf-ir.la \
+	ctf-writer/libctf-writer.la
 
 if BUILT_IN_PYTHON_PLUGIN_SUPPORT
 libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la
 endif
+
+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