X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=de436c40b9df0b712841733740a3a8100741be67;hb=2f5a009b5615db990687d0775038fdc82bbe8071;hp=1d66b1d4ce6c81a88fc8208410e2f2a3b9fb01f8;hpb=6fbd4105b92d0da8b3c5818a5b7c5b07850f4a01;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 1d66b1d4..de436c40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,20 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =			\
-	include			\
+SUBDIRS = include		\
 	common			\
-	types			\
-	compat
+	compat			\
+	logging
 
-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			\
-	formats			\
 	plugins			\
-	converter		\
+	cli			\
 	bindings		\
 	tests			\
 	doc			\