X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=938dc75bbcdf23b7bdf868dfcfc9d0e5d0c2aaf5;hb=bf43665775513c187cce8a1fea97eeaf36bc6c35;hp=fab48f1947132627e39ef7c00960db5923103ae3;hpb=e98a2d6e0c0c7a9f28e620ce975b8c242ee20c9f;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index fab48f19..938dc75b 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 types compat lib formats plugins converter bindings tests doc extras ctf-reader-proto
+SUBDIRS = include		\
+	common			\
+	ctfser			\
+	fd-cache		\
+	compat			\
+	logging			\
+	lib			\
+	python-plugin-provider	\
+	ctf-writer		\
+	plugins			\
+	cli			\
+	bindings		\
+	doc			\
+	tests
+
+# Directories added to EXTRA_DIST will be recursively copied to the distribution.
+EXTRA_DIST = \
+	extras
 
 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-writer.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