X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=d627c840d9e8b7243de0ab004d3e5e9bb49d8d76;hp=39b9f2f94aadc8557955d45cce1713ebbdbc8b20;hb=ec5b87f3610b3b0e52ce6109600930deb5996cca;hpb=daf282ab93462198c6acd16b4aa624635df1bea5

diff --git a/Makefile.am b/Makefile.am
index 39b9f2f94..d627c840d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,20 +1,23 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = common \
-		  liblttng-sessiond-comm \
-		  libkernelctl \
-		  librunas \
-		  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 \
+	     LICENSES/BSD-2-Clause \
+	     LICENSES/BSD-3-Clause \
+	     LICENSES/GPL-2.0 \
+	     LICENSES/LGPL-2.1 \
+	     LICENSES/MIT \
+	     version