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

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