X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=39b956a98a6ab4907c6ba42c2c07c44560c3bc8f;hb=67d2ce028c96b6a3b3614b393d8928663bce4490;hp=5ae2be4227cd16b1851b6bd64b34463a4ee1ffbf;hpb=05c031000c447ff01c8f23e1d0b5455a18b8dfc2;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5ae2be42..39b956a9 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,37 +1,26 @@
-SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph .
+SUBDIRS = trace-ir prio_heap plugin graph
 
-lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la
+lib_LTLIBRARIES = libbabeltrace2.la
 
-libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c
-libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \
+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_LIBADD = \
+libbabeltrace2_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 \
+	trace-ir/libtrace-ir.la \
+	$(top_builddir)/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/common/libbabeltrace2-common.la \
 	$(top_builddir)/compat/libcompat.la
 
-if BUILT_IN_PYTHON_PLUGIN_SUPPORT
-libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la
+if ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT
+libbabeltrace2_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace2-python-plugin-provider.la
 endif
-
-# Build a libbabeltrace-ctf library for backwards compatibility.
-# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this
-# file must still exist. As of Babeltrace 2, CTF writer is implemented
-# in libbabeltrace.
-libbabeltrace_ctf_la_SOURCES = babeltrace.c values.c ref.c logging.c
-libbabeltrace_ctf_la_LDFLAGS = $(LT_NO_UNDEFINED) \
-			-version-info $(BABELTRACE_LIBRARY_VERSION)
-
-libbabeltrace_ctf_la_LIBADD = \
-	graph/libgraph.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