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

diff --git a/Makefile.am b/Makefile.am
index ffbad29f0..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,18 @@
-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
 
-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 \
+	     version