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

diff --git a/Makefile.am b/Makefile.am
index 1d66b1d4..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			\
-	types			\
-	compat
-
-if WITH_PYTHON_PLUGINS
-SUBDIRS += python-plugin-provider
-endif
-
-SUBDIRS +=			\
-	lib			\
-	formats			\
-	plugins			\
-	converter		\
-	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