X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=d18aca1437e5f9b6ba97d222776e4bb46b2601b4;hb=6f89b613e4991c1816a0747ea8bbf3ae4fb17a9d;hp=7b2a23f0da3c7b529f8d10451b9f60e506b6cec2;hpb=b7d2e95f49f3b34c9f00a0fb4d9de10bba056180;p=lttng-tools.git

diff --git a/Makefile.am b/Makefile.am
index 7b2a23f0d..d18aca143 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include \
-		  src \
-		  tests \
-		  extras \
-		  doc
+DIST_SUBDIRS = include src extras doc tests
+
+SUBDIRS = include src doc tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
+endif
 
 dist_doc_DATA = LICENSE \
                 ChangeLog \
@@ -12,4 +14,5 @@ dist_doc_DATA = LICENSE \
 
 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