lib: add internal object pool API and use it; adapt plugins/tests

[babeltrace.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 48a95c11ca5983d75c06cfad1d92f21bf6295556..121279a2b57b0a37f87bc73e3d70dacba3b46ade 100644 (file)
--- 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
-
 lib_LTLIBRARIES = libbabeltrace.la libbabeltrace-ctf.la
 
-libbabeltrace_la_SOURCES = babeltrace.c values.c ref.c logging.c
+libbabeltrace_la_SOURCES = \
+       babeltrace.c \
+       values.c \
+       ref.c \
+       lib-logging.c \
+       logging.c \
+       object-pool.c
 libbabeltrace_la_LDFLAGS = $(LT_NO_UNDEFINED) \
                        -version-info $(BABELTRACE_LIBRARY_VERSION)
 
@@ -18,7 +22,7 @@ libbabeltrace_la_LIBADD = \
        $(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
 
@@ -26,7 +30,7 @@ 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)