X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=552fe510b33363fad4dadf950c7c3d4ef537260f;hp=fa5beea9a9df6ddd0d5cdcdd4ee1d7ea0191cbb2;hb=2ebe596e3e57e57220afae2b4499aff6348ce3a7;hpb=55bed2138489dd1bfc43726e0ce71f7d5ee6d62c

diff --git a/Makefile.am b/Makefile.am
index fa5beea9a..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = liblttng-sessiond-comm \
-		  libkernelctl \
-		  liblttng-kconsumer \
-		  liblttng-ustconsumer \
-		  liblttng-consumer \
-		  lttng-consumerd
+DIST_SUBDIRS = include doc src extras tests
 
-if ! BUILD_CONSUMERD_ONLY
-SUBDIRS += liblttngctl \
-           lttng \
-           lttng-sessiond
+SUBDIRS = include doc src tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
 endif
 
-SUBDIRS += tests \
-           include \
-           doc
+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