X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=7197944092b86733dd9bcb39629d80ec5c6442b3;hp=f73b6d475aba61a0930d1608523ff304e24257b5;hb=af597f37371c47fb3ce4e605d9675b53dca6daf1;hpb=52f120df444c1ba7896a65360374fea7cfebf865

diff --git a/Makefile.am b/Makefile.am
index f73b6d47..71979440 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,40 +1,14 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include		\
-	common			\
-	ctfser			\
-	fd-cache		\
-	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		\
-	doc			\
+SUBDIRS = \
+	include \
+	src \
+	doc \
 	tests
 
-# Directories added to EXTRA_DIST will be recursively copied to the distribution.
-EXTRA_DIST = \
-	extras
-
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-		std-ext-lib.txt README CONTRIBUTING.adoc
+		std-ext-lib.txt README.adoc CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
 
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf.pc
-
-# This is a convenience target, it's not part of the build process.
-CONTRIBUTING.html: CONTRIBUTING.adoc
-	$(ASCIIDOC) --verbose -a source-highlighter=pygments $<
-
-CLEANFILES = CONTRIBUTING.html
+EXTRA_DIST = version