X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=fe6b88b0b993546cb4f50b60a35d047e297da98a;hb=a12f3d624772f543137e60252101871cd6017a06;hp=edae4bee359b264272f724eebb915a5ab1a6b8b0;hpb=c40a57e579977be9eb7682480428a89af5ca529c;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index edae4bee..fe6b88b0 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,31 +1,48 @@
-SUBDIRS = prio_heap .
+SUBDIRS = trace-ir ctf-writer prio_heap plugin graph .
 
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+lib_LTLIBRARIES = libbabeltrace2.la libbabeltrace2-ctf.la
 
-lib_LTLIBRARIES = libbabeltrace.la
+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_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_DEBUGINFO
-noinst_LTLIBRARIES = libdebuginfo.la
+libbabeltrace2_la_LIBADD = \
+	prio_heap/libprio_heap.la \
+	graph/libgraph.la \
+	plugin/libplugin.la \
+	trace-ir/libtrace-ir.la \
+	ctf-writer/libctf-writer.la \
+	$(top_builddir)/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/common/libbabeltrace2-common.la \
+	$(top_builddir)/ctfser/libbabeltrace2-ctfser.la \
+	$(top_builddir)/compat/libcompat.la
 
-libdebuginfo_la_SOURCES = debuginfo.c \
-			    so-info.c \
-			    dwarf.c \
-			    crc32.c
-libdebuginfo_la_LDFLAGS = -lelf -ldw
+if ENABLE_BUILT_IN_PYTHON_PLUGIN_SUPPORT
+libbabeltrace2_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace2-python-plugin-provider.la
 endif
 
-libbabeltrace_la_LIBADD = \
-	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la \
+# FIXME: Should we drop this? We changed the basename of the library,
+#        libbabeltrace2 is not a drop-in replacement for libbabeltrace anymore.
+#
+# Build a libbabeltrace2-ctf library for backwards compatibility.
+# CTF writer used to be in libbabeltrace2-ctf in Babeltrace 1, so this
+# file must still exist. As of Babeltrace 2, CTF writer is implemented
+# in libbabeltrace2.
+libbabeltrace2_ctf_la_SOURCES = $(libbabeltrace2_la_SOURCES)
+libbabeltrace2_ctf_la_LDFLAGS = $(LT_NO_UNDEFINED) \
+			-version-info $(BABELTRACE_LIBRARY_VERSION)
+
+libbabeltrace2_ctf_la_LIBADD = \
+	graph/libgraph.la \
+	trace-ir/libtrace-ir.la \
+	ctf-writer/libctf-writer.la \
+	$(top_builddir)/logging/libbabeltrace2-logging.la \
+	$(top_builddir)/common/libbabeltrace2-common.la \
+	$(top_builddir)/ctfser/libbabeltrace2-ctfser.la \
 	$(top_builddir)/compat/libcompat.la