X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=f49ba956e851efacb1ebe5bd3d0e6a9322b16e0b;hp=475b31a4d7bcabbe273af9680f262044ee68a819;hb=2671dfad32dfd51f43560dc19d69dc0b54f3cd2a;hpb=4a9f5414b1793bedbfd0aebbb907009e680a6262

diff --git a/Makefile.am b/Makefile.am
index 475b31a4..f49ba956 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,37 +1,12 @@
 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			\
-	extras			\
+SUBDIRS = \
+	include \
+	src \
+	doc \
 	tests
 
 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 = babeltrace.pc babeltrace-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