X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=eb6831a2b16a308835d6c5fcd7a9de081c494d1f;hp=4b517db724308208f4c699a68daf8cffb9a15841;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=1670bffdf312795f277237062cca264967f13fd0

diff --git a/Makefile.am b/Makefile.am
index 4b517db7..eb6831a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,34 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include common types compat lib formats plugins 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		\
+	doc			\
+	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