Add environment variable to allow abort on error

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 13d3f933b5fb0d7d6803c374cd876c0951625395..63101c541ce5f9f68c52736d24d7d4bcc15f600a 100644 (file)
--- 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 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
+EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt