X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=de436c40b9df0b712841733740a3a8100741be67;hp=e5eca77f506b4fcbf0bf7b5e1e379d145115bb91;hb=149bc52e92f860f992d02ca19371ca8d8321f3df;hpb=e7a7efdbc48f32f2b1defe591d7d000c6579b5a2

diff --git a/Makefile.am b/Makefile.am
index e5eca77f..de436c40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,27 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types compat lib formats converter tests doc extras
+SUBDIRS = include		\
+	common			\
+	compat			\
+	logging
+
+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
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-		std-ext-lib.txt
+		std-ext-lib.txt README
 
 dist_noinst_DATA = CodingStyle