X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=552fe510b33363fad4dadf950c7c3d4ef537260f;hp=e53d9079ee947f196b647f8488debf4475123320;hb=531be721f74add51145d8d5c512d7c33366ad890;hpb=fac6795d6e2c60e79bdc7dab42da94d2025a57d3

diff --git a/Makefile.am b/Makefile.am
index e53d9079e..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = liblttsessiondcomm liblttngctl lttng ltt-sessiond tests
+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