X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=63101c541ce5f9f68c52736d24d7d4bcc15f600a;hp=ffbad29f08adfecb4f3cd83f417225bdbaefee76;hb=cf0bcb51ea857687a353d2851e572dba6cc63cb0;hpb=cf65966e6932b5de2e4e8895dee674e16b09f574

diff --git a/Makefile.am b/Makefile.am
index ffbad29f0..63101c541 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src \
-		  tests \
-		  include \
-		  doc
+DIST_SUBDIRS = include src extras doc tests
 
-dist_doc_DATA = ChangeLog
+SUBDIRS = include src doc tests
 
-EXTRA_DIST = extras/lttng-bash_completion
+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