X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=63101c541ce5f9f68c52736d24d7d4bcc15f600a;hp=e43da8d755749e00958703136e518cdcbcb063fb;hb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;hpb=d6309f5907981526e78078dfb87419fbd267f270

diff --git a/Makefile.am b/Makefile.am
index e43da8d75..63101c541 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = liblttng-sessiond-comm \
-		  libkernelctl \
-		  liblttng-kconsumer \
-		  liblttng-ustconsumer \
-		  liblttng-consumer \
-		  lttng-consumerd \
-		  liblttngctl \
-		  lttng \
-		  ltt-sessiond \
-		  tests \
-		  include \
-		  doc
+ACLOCAL_AMFLAGS = -I m4
+
+DIST_SUBDIRS = include src extras doc tests
+
+SUBDIRS = include src doc tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
+endif
+
+dist_doc_DATA = LICENSE \
+                ChangeLog \
+		README.md
+
+dist_noinst_DATA = CodingStyle
+
+EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt