X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=938dc75bbcdf23b7bdf868dfcfc9d0e5d0c2aaf5;hb=67d2ce028c96b6a3b3614b393d8928663bce4490;hp=eb6831a2b16a308835d6c5fcd7a9de081c494d1f;hpb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index eb6831a2..938dc75b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,33 +2,33 @@ 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 +=			\
+	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
 
-CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
-	asciidoc --verbose -a source-highlighter=pygments $<
+# 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