X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=4f89b42d9d468a163cfd98bc665b7d49d09cfa3f;hb=9ffc0257721b043158a502d3fcd7eb275630a95b;hp=49fff815ce59824f37a584c68c94d0c7c183dd5b;hpb=4f45f9bb59b86410a0f872899d1a66d6e1a520c8;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 49fff815..4f89b42d 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,21 +1,37 @@
-SUBDIRS = ctf-ir ctf-writer 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 values.c ref.c
-libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION)
+libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c
+libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \
+			-version-info $(BABELTRACE_LIBRARY_VERSION)
 
 libbabeltrace_la_LIBADD = \
 	prio_heap/libprio_heap.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
+	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 = 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