X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=6ebdb589a7033704e87affbbb47fb58f82094d28;hp=b744596b1905eecf307aef95254280b2945458d3;hb=f9d2ba6ae32397fd818279ea90d3691c60f0e079;hpb=58415b8b6071fddaa8f99c9799e9c30608dbb971

diff --git a/Makefile.am b/Makefile.am
index b744596b1..6ebdb589a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = common \
-		  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