X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=33abcf8b71d980d4742e5f5ee8d8bee7dcb11190;hb=b04a139e576b2e852350f15a56692e8a7bc0149f;hp=8099f48bda7b2375b6d6e2aa4feda9609169727b;hpb=91dadb0fc9ae45e589527dfd189ae33ecee42844;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 8099f48b..33abcf8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,31 +1,37 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include		\
 	common			\
+	ctfser			\
+	fd-cache		\
 	compat			\
-	logging
+	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			\
 	plugins			\
 	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
+pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf.pc
+
+# This is a convenience target, it's not part of the build process.
+CONTRIBUTING.html: CONTRIBUTING.adoc
+	$(ASCIIDOC) --verbose -a source-highlighter=pygments $<
+
+CLEANFILES = CONTRIBUTING.html