X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=d18aca1437e5f9b6ba97d222776e4bb46b2601b4;hb=1178c6c5e40ea48208f4fa27eed7db5d3e29aa6b;hp=584f59b2e63102d1fb687a988899eb32746f4753;hpb=f7ddd24e694b77d4f0bf92967120321d24243054;p=lttng-tools.git

diff --git a/Makefile.am b/Makefile.am
index 584f59b2e..d18aca143 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src \
-		  tests \
-		  extras \
-		  include \
-		  doc
+DIST_SUBDIRS = include src extras doc tests
+
+SUBDIRS = include src doc 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 gpl-2.0.txt lgpl-2.1.txt \
+	     version