X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=938dc75bbcdf23b7bdf868dfcfc9d0e5d0c2aaf5;hb=bf43665775513c187cce8a1fea97eeaf36bc6c35;hp=475b31a4d7bcabbe273af9680f262044ee68a819;hpb=77a4634ece997098a9fbc5c3839f7eb1c4ff6b72;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 475b31a4..938dc75b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,29 +6,26 @@ SUBDIRS = include		\
 	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 +=			\
+	lib			\
+	python-plugin-provider	\
+	ctf-writer		\
 	plugins			\
 	cli			\
 	bindings		\
 	doc			\
-	extras			\
 	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
+pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf-writer.pc
 
 # This is a convenience target, it's not part of the build process.
 CONTRIBUTING.html: CONTRIBUTING.adoc