X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=552fe510b33363fad4dadf950c7c3d4ef537260f;hp=dce10f8363f39f34f49a14445e1b83d646e976ea;hb=531be721f74add51145d8d5c512d7c33366ad890;hpb=ee0326c0c46f4b02e9eab0b2917b62d2c55aa346

diff --git a/Makefile.am b/Makefile.am
index dce10f836..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = liblttsessiondcomm \
-		  libkernelctl \
-		  liblttngctl \
-		  lttng \
-		  ltt-sessiond \
-		  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 \
+	     version