X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=6ebdb589a7033704e87affbbb47fb58f82094d28;hp=13d3f933b5fb0d7d6803c374cd876c0951625395;hb=4e52320d2950b79dc3ce537c32882c26f8c13846;hpb=5b6742b7de8b11d5df127586d2e354e9ae38c3ed

diff --git a/Makefile.am b/Makefile.am
index 13d3f933b..6ebdb589a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,17 @@
-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