X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2FMakefile.am;h=1b4d0c119a976b3930bd4d47b754234317f888f5;hb=003e713f9ed79e4d7dd5aed20bc270fc9b22374b;hp=48a95c11ca5983d75c06cfad1d92f21bf6295556;hpb=91dadb0fc9ae45e589527dfd189ae33ecee42844;p=babeltrace.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48a95c11..1b4d0c11 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,10 +1,14 @@
-SUBDIRS = ctf-ir ctf-writer prio_heap plugin graph .
-
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
+SUBDIRS = trace-ir ctf-writer prio_heap plugin graph .
 
 lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la
 
-libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c
+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)
 
@@ -12,13 +16,14 @@ libbabeltrace_la_LIBADD = \
 	prio_heap/libprio_heap.la \
 	graph/libgraph.la \
 	plugin/libplugin.la \
-	ctf-ir/libctf-ir.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 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
 
@@ -26,14 +31,15 @@ endif
 # 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_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 \
+	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