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

diff --git a/Makefile.am b/Makefile.am
index c6c7af5ce..d627c840d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,23 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include \
-		  src \
-		  tests \
-		  extras \
-		  doc
+DIST_SUBDIRS = include doc src extras tests
+
+SUBDIRS = include doc src tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
+endif
 
 dist_doc_DATA = LICENSE \
-                ChangeLog
+                ChangeLog \
+		README.md
 
 dist_noinst_DATA = CodingStyle
 
-EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt
+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