X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=Makefile.am;h=eb6831a2b16a308835d6c5fcd7a9de081c494d1f;hp=6584c5d2985c8498b01b63db94c9a0fd0c7829fd;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=24a3136a3837ee43162b1393827faa938f0789eb

diff --git a/Makefile.am b/Makefile.am
index 6584c5d2..eb6831a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,34 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include types lib formats converter bindings tests doc
+SUBDIRS = include		\
+	common			\
+	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 +=			\
+	plugins			\
+	cli			\
+	bindings		\
+	doc			\
+	extras			\
+	tests
 
 dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
-		std-ext-lib.txt
+		std-ext-lib.txt README CONTRIBUTING.adoc
 
 dist_noinst_DATA = CodingStyle
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc
+
+CONTRIBUTING.html: $(srcdir)/CONTRIBUTING.adoc
+	asciidoc --verbose -a source-highlighter=pygments $<
+
+CLEANFILES = CONTRIBUTING.html