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

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1d66b1d4ce6c81a88fc8208410e2f2a3b9fb01f8..eb6831a2b16a308835d6c5fcd7a9de081c494d1f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,31 +1,34 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =                      \
-       include                 \
+SUBDIRS = include              \
        common                  \
-       types                   \
-       compat
+       compat                  \
+       logging                 \
+       lib
 
-if WITH_PYTHON_PLUGINS
+if ENABLE_PYTHON_PLUGINS
+# Only build the Python plugin provider shared object if the
+# configuration doesn't ask to make it built-in.
 SUBDIRS += python-plugin-provider
 endif
 
 SUBDIRS +=                     \
-       lib                     \
-       formats                 \
        plugins                 \
-       converter               \
+       cli                     \
        bindings                \
-       tests                   \
        doc                     \
-       extras
+       extras                  \
+       tests
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-               std-ext-lib.txt README
+               std-ext-lib.txt README CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+
+CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
+       asciidoc --verbose -a source-highlighter=pygments $<
+
+CLEANFILES = CONTRIBUTING.html