X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=341f83533695aa362093071c22394d2ce114109e;hp=c3c64e09a01db8623b2ff312645196fbfe54d14c;hb=6c20f4a0c496cfac67ceabe876edc796929ffb64;hpb=ccde9b25397f3e74c60bfbcb9f77008299a44cc9

diff --git a/Makefile.am b/Makefile.am
index c3c64e09..341f8353 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,36 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types compat lib formats converter bindings tests doc extras
+SUBDIRS = include		\
+	common			\
+	ctfser			\
+	fd-cache		\
+	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
+		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