Add environment variable to allow abort on error

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b744596b1905eecf307aef95254280b2945458d3..63101c541ce5f9f68c52736d24d7d4bcc15f600a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,19 +1,17 @@
-ACLOCAL_AMFLAGS = -I config
+ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = common \
-                 liblttng-sessiond-comm \
-                 libkernelctl \
-                 liblttng-kconsumer \
-                 liblttng-ustconsumer \
-                 liblttng-consumer \
-                 lttng-consumerd
+DIST_SUBDIRS = include src extras doc tests
 
-if ! BUILD_CONSUMERD_ONLY
-SUBDIRS += liblttngctl \
-           lttng \
-           lttng-sessiond
+SUBDIRS = include src doc tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
 endif
 
-SUBDIRS += tests \
-           include \
-           doc
+dist_doc_DATA = LICENSE \
+                ChangeLog \
+               README.md
+
+dist_noinst_DATA = CodingStyle
+
+EXTRA_DIST = extras/lttng-bash_completion gpl-2.0.txt lgpl-2.1.txt