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

diff --git a/Makefile.am b/Makefile.am
index f5830a744..552fe510b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,12 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = include \
-		  src \
-		  tests \
-		  extras \
-		  doc
+DIST_SUBDIRS = include doc src extras tests
+
+SUBDIRS = include doc src 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