X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=Makefile.am;h=d627c840d9e8b7243de0ab004d3e5e9bb49d8d76;hb=43d5f1c5529c19441a6237c4f2144a71b2f285ca;hp=831ac9d29eca4dbb22470ef49925c94695eee8b3;hpb=b903e1f1807b150acb4f26508c0087bb1ea79c39;p=lttng-tools.git

diff --git a/Makefile.am b/Makefile.am
index 831ac9d29..d627c840d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,23 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src \
-		  tests \
-		  include \
-		  doc
+DIST_SUBDIRS = include doc src extras tests
 
-dist_doc_DATA = ChangeLog
+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 \
+	     LICENSES/BSD-2-Clause \
+	     LICENSES/BSD-3-Clause \
+	     LICENSES/GPL-2.0 \
+	     LICENSES/LGPL-2.1 \
+	     LICENSES/MIT \
+	     version