X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=552fe510b33363fad4dadf950c7c3d4ef537260f;hp=3d86d6e66f238ff51569f22c6f3d1f90e213b25d;hb=b02f5986773579a5a331d3e108ba52ec9acde2e1;hpb=6e2d116c6138874c0357b1afb1db5aa7cd80ceb6

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