X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=552fe510b33363fad4dadf950c7c3d4ef537260f;hp=5c27eabe3558080b97c47e4cefd284d2bafb646b;hb=74e89a8c6a6824c4ca8179a3ae7b9cc4c99bddc5;hpb=d4a1283e471c152cedf6cb5ebcc74d509009145d

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