X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=f49ba956e851efacb1ebe5bd3d0e6a9322b16e0b;hp=8099f48bda7b2375b6d6e2aa4feda9609169727b;hb=2671dfad32dfd51f43560dc19d69dc0b54f3cd2a;hpb=91dadb0fc9ae45e589527dfd189ae33ecee42844

diff --git a/Makefile.am b/Makefile.am
index 8099f48b..f49ba956 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,31 +1,12 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include		\
-	common			\
-	compat			\
-	logging
-
-if WITH_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
+SUBDIRS = \
+	include \
+	src \
+	doc \
+	tests
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-		std-ext-lib.txt README
+		std-ext-lib.txt README.adoc CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc