X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=76ba8249d5bd33e28086f4d390b72de1c63c6def;hb=172e6876abbb70d0323a500e6b44f90641fbe2fb;hp=a7fecfead89f407e361de1718bb91d6641ba00df;hpb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index a7fecfea..76ba8249 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,36 +1,33 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS =			\
-	include			\
+SUBDIRS = include		\
 	common			\
-	compat
-
-if WITH_PYTHON_PLUGINS
-SUBDIRS += python-plugin-provider
-endif
-
-SUBDIRS +=			\
+	ctfser			\
+	fd-cache		\
+	compat			\
+	logging			\
 	lib			\
+	python-plugin-provider	\
 	plugins			\
-	converter		\
+	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.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