X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=938dc75bbcdf23b7bdf868dfcfc9d0e5d0c2aaf5;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=63613f885912907a775b99f1d6069dbcfc6ab206;hpb=beb0fb75663091c20765a8508162711ba828f456;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index 63613f88..938dc75b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,37 +1,34 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =			\
-	include			\
+SUBDIRS = include		\
 	common			\
+	ctfser			\
+	fd-cache		\
 	compat			\
-	logging
-
-if WITH_PYTHON_PLUGINS
-SUBDIRS += python-plugin-provider
-endif
-
-SUBDIRS +=			\
+	logging			\
 	lib			\
+	python-plugin-provider	\
+	ctf-writer		\
 	plugins			\
 	cli			\
 	bindings		\
-	tests			\
 	doc			\
+	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
+		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
+	$(ASCIIDOC) --verbose -a source-highlighter=pygments $<
 
-# 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
+CLEANFILES = CONTRIBUTING.html