X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=98fd7d44fcb07098f9c5dc4471d9eb66c61e49db;hb=5abb9e3309c1aa2b622daebd9bea9da67a6554b8;hp=0a9bb9abe17d5250c3e342fac2bc9c666e70388d;hpb=d2c0553c848fd84979ac2d3d5fce8fafd56105b3;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 0a9bb9ab..98fd7d44 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,34 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types formats lib converter tests doc
+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		\
+	tests			\
+	doc			\
+	extras
 
 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