X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=552fe510b33363fad4dadf950c7c3d4ef537260f;hp=fe1c45cef59d4176d4768408a513a466585a342a;hb=6186e5b839c77af387614eec6a1c24053e46c849;hpb=2b1173d8cb43cb5d7c9ce3772dbdbef3436c407e

diff --git a/Makefile.am b/Makefile.am
index fe1c45cef..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,12 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = liblttsessiondcomm \
-		  libkernelctl \
-		  liblttkconsumerd \
-		  liblttngctl \
-		  libustcomm \
-		  libustctl \
-		  lttng \
-		  ltt-kconsumerd \
-		  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