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

diff --git a/Makefile.am b/Makefile.am
index 6e90e481..33abcf8b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,36 +1,37 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =			\
-	include			\
+SUBDIRS = include		\
 	common			\
-	compat
-
-if WITH_PYTHON_PLUGINS
+	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			\
 	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
+		std-ext-lib.txt README CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
-
-# Create a symlink from libbabeltrace-ctf to libbabeltrace.
-# CTF writer used to be in libbabeltrace-ctf in Babeltrace 1, so this
-# file must still exist. As of Babeltrace 2, CTF writer is implemented
-# in libbabeltrace, hence the symlink.
-install-exec-hook:
-	$(LN_S) -f libbabeltrace.so $(DESTDIR)$(libdir)/libbabeltrace-ctf.so
+pkgconfig_DATA = babeltrace2.pc babeltrace2-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