X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=1b4d0c119a976b3930bd4d47b754234317f888f5;hb=d841f73357d2738ff2b283a5f677ac76a49b0ed7;hp=7ffb164657d42004bff9da3a49591e622fecb6f2;hpb=018f3175330093bae1c35ed2e571c8181254c545;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 7ffb1646..1b4d0c11 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,17 +1,45 @@
-SUBDIRS = prio_heap .
+SUBDIRS = trace-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 \
+	value.c \
+	util.c \
+	lib-logging.c \
+	logging.c \
+	object-pool.c
+libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \
+			-version-info $(BABELTRACE_LIBRARY_VERSION)
 
-libbabeltrace_la_SOURCES = babeltrace.c \
-			   iterator.c \
-			   context.c \
-			   trace-handle.c \
-			   trace-collection.c \
-			   registry.c
-
-libbabeltrace_la_LDFLAGS = \
-	-Wl,--no-as-needed \
+libbabeltrace_la_LIBADD = \
 	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la
+	graph/libgraph.la \
+	plugin/libplugin.la \
+	trace-ir/libtrace-ir.la \
+	ctf-writer/libctf-writer.la \
+	$(top_builddir)/logging/libbabeltrace-logging.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
+	$(top_builddir)/ctfser/libbabeltrace-ctfser.la \
+	$(top_builddir)/compat/libcompat.la
+
+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 \
+	trace-ir/libtrace-ir.la \
+	ctf-writer/libctf-writer.la \
+	$(top_builddir)/logging/libbabeltrace-logging.la \
+	$(top_builddir)/common/libbabeltrace-common.la \
+	$(top_builddir)/ctfser/libbabeltrace-ctfser.la \
+	$(top_builddir)/compat/libcompat.la