X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=6ebdb589a7033704e87affbbb47fb58f82094d28;hp=9bafeb4818d23906dd9daf7d2779e22446edb94c;hb=9402c5b93a3e3344612a9938878bddb1430a3418;hpb=3bd1e0819b577ffcb44acd7c2f8e02ff09654b7b

diff --git a/Makefile.am b/Makefile.am
index 9bafeb481..6ebdb589a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,15 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = liblttng-sessiond-comm \
-		  libkernelctl \
-		  liblttng-kconsumer \
-		  liblttng-ustconsumer \
-		  liblttng-consumer \
-		  lttng-consumerd \
-		  liblttngctl \
-		  libustcomm \
-		  lttng \
-		  ltt-sessiond \
-		  tests \
-		  include \
-		  doc
+ACLOCAL_AMFLAGS = -I m4
+
+DIST_SUBDIRS = include doc src extras tests
+
+SUBDIRS = include doc src 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