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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index f8324a92..5ae2be42 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,33 +1,37 @@
-SUBDIRS = prio_heap .
+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 logging.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 \
-			   values.c \
-			   ref.c
-
-libbabeltrace_la_LDFLAGS = -version-info $(BABELTRACE_LIBRARY_VERSION)
-
-if ENABLE_DEBUGINFO
-noinst_LTLIBRARIES = libdebuginfo.la
+libbabeltrace_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 \
+	$(top_builddir)/compat/libcompat.la
 
-libdebuginfo_la_SOURCES = debuginfo.c \
-			  so-info.c \
-			  dwarf.c \
-			  crc32.c \
-			  utils.c
-libdebuginfo_la_LDFLAGS = -lelf -ldw
-libdebuginfo_la_LIBADD = libbabeltrace.la
+if BUILT_IN_PYTHON_PLUGIN_SUPPORT
+libbabeltrace_la_LIBADD += $(top_builddir)/python-plugin-provider/libbabeltrace-python-plugin-provider.la
 endif
 
-libbabeltrace_la_LIBADD = \
-	prio_heap/libprio_heap.la \
-	$(top_builddir)/types/libbabeltrace_types.la \
+# 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