Python bt2: remove type restriction on structure __setitem__

[babeltrace.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d28fbc0f78f2e233e172bfc5b774c40eb0ae6011..98fd7d44fcb07098f9c5dc4471d9eb66c61e49db 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,34 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types lib formats converter bindings tests doc extras
+SUBDIRS = include              \
+       common                  \
+       compat                  \
+       logging                 \
+       lib
+
+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 +=                     \
+       plugins                 \
+       cli                     \
+       bindings                \
+       tests                   \
+       doc                     \
+       extras
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-               std-ext-lib.txt
+               std-ext-lib.txt README CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc
+pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+
+CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
+       asciidoc --verbose -a source-highlighter=pygments $<
+
+CLEANFILES = CONTRIBUTING.html