X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=de436c40b9df0b712841733740a3a8100741be67;hb=f0ea9318c34603eaed936234d3953e80d2536e62;hp=f88b548ee33251952246b2c06828463a7b1052d7;hpb=ac65e35509398c6f3f27b26e9309750a565e1cbd;p=babeltrace.git

diff --git a/Makefile.am b/Makefile.am
index f88b548e..de436c40 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,29 @@
-AM_CFLAGS = $(PACKAGE_CFLAGS) -I$(top_srcdir)/include
-
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = types . tests
+SUBDIRS = include		\
+	common			\
+	compat			\
+	logging
+
+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
 
-bin_PROGRAMS = babeltrace
+dist_doc_DATA = ChangeLog LICENSE mit-license.txt gpl-2.0.txt \
+		std-ext-lib.txt README
 
-babeltrace_LDADD = \
-	types/types.a \
-	formats/registry.a
+dist_noinst_DATA = CodingStyle
 
-# converter/
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = babeltrace.pc babeltrace-ctf.pc