X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=6ebdb589a7033704e87affbbb47fb58f82094d28;hp=df3067e0225a3fce67c9e1fd5c8d65961bdcba28;hb=2daf65025e0fe5c15179dc4bfb26f875e3d31a26;hpb=ca3c5ac0cf100d80352a1a81936b5adc47942f35

diff --git a/Makefile.am b/Makefile.am
index df3067e02..6ebdb589a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = liblttng-sessiond-comm \
-		  libkernelctl \
-		  liblttkconsumerd \
-		  liblttngctl \
-		  libustcomm \
-		  libustctl \
-		  lttng \
-		  ltt-kconsumerd \
-		  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