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

diff --git a/Makefile.am b/Makefile.am
index b16632a4a..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src \
-		  tests \
-		  include \
-		  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
+EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt \
+	     version