X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=33abcf8b71d980d4742e5f5ee8d8bee7dcb11190;hb=d9676d8c5afce3c35d282fb5053a9bbc7427526b;hp=98fd7d44fcb07098f9c5dc4471d9eb66c61e49db;hpb=f9ded0e0b7cec670982963369284612ec1a251c7;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 98fd7d44..33abcf8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include		\
 	common			\
+	ctfser			\
+	fd-cache		\
 	compat			\
 	logging			\
 	lib
@@ -16,9 +18,9 @@ SUBDIRS +=			\
 	plugins			\
 	cli			\
 	bindings		\
-	tests			\
 	doc			\
-	extras
+	extras			\
+	tests
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
 		std-ext-lib.txt README CONTRIBUTING.adoc
@@ -26,9 +28,10 @@ dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+pkgconfig_DATA = babeltrace2.pc babeltrace2-ctf.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