X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=341f83533695aa362093071c22394d2ce114109e;hp=4c6b4d37a9197a66f86a78748a1749a233d042d5;hb=1e638f98d6c4f2c799d4ea4c826f711a59d9f531;hpb=c3ddb532606565c9526c20703b5c70171031c558

diff --git a/Makefile.am b/Makefile.am
index 4c6b4d37..341f8353 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,38 +1,36 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = include		\
 	common			\
+	ctfser			\
+	fd-cache		\
 	compat			\
-	logging
+	logging			\
+	lib
 
-if WITH_PYTHON_PLUGINS
+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
+CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
+	asciidoc --verbose -a source-highlighter=pygments $<
+
+CLEANFILES = CONTRIBUTING.html