X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=6ebdb589a7033704e87affbbb47fb58f82094d28;hp=b0537ce6e4f4ea55b049966c33ae64fecc9e35ab;hb=b878f05a6e62779ddf2364d5bb51821cb6d6d572;hpb=36907cb5a542b8eb01d95e1990894abd45e98bc0

diff --git a/Makefile.am b/Makefile.am
index b0537ce6e..6ebdb589a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = src \
-		  tests \
-		  extras \
-		  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