X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=2bd6bf048f877a38e6132e77086e14965a9ae0e1;hb=e373846d806aacb2841f4dd399a28296e2b5c5fe;hp=1709f95745a0dd03d64f7851969ea6106e6f091f;hpb=2a1cf9f0ceaa44f0b33f4bcb62a4026eb95dff80;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 1709f957..2bd6bf04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,24 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types compat lib formats converter bindings tests doc extras
+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 README