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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0ba33f39..121279a2 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,40 +1,43 @@
-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-ctf.la
 
-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_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_SOURCES = \
+	babeltrace.c \
+	values.c \
+	ref.c \
+	lib-logging.c \
+	logging.c \
+	object-pool.c
+libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \
+			-version-info $(BABELTRACE_LIBRARY_VERSION)
 
 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 \
+	$(top_builddir)/logging/libbabeltrace-logging.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
+	$(top_builddir)/compat/libcompat.la
 
-if BUILT_IN_PYTHON_PLUGIN_SUPPORT
+if ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT
 libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-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 = $(libbabeltrace_la_SOURCES)
+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