X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=745ff31e1cac9d32169c20f941a893222d9d9bba;hb=4e87f509dec8aed765d6b6b4c868be65b8580c37;hp=475b31a4d7bcabbe273af9680f262044ee68a819;hpb=4a9f5414b1793bedbfd0aebbb907009e680a6262;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 475b31a4..745ff31e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,35 +1,20 @@
 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
 
+# 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
 
 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 $<