X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=6ebdb589a7033704e87affbbb47fb58f82094d28;hp=b7c5f0f3391fa2d703eb820c30393743405d0322;hb=437afa719f5e777dac77827298c443f450e0903e;hpb=1ce86c9ab52be743e3348fd0c90153d9a9f63c49

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