Fix: initialize var_data to NULL

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b0537ce6e4f4ea55b049966c33ae64fecc9e35ab..552fe510b33363fad4dadf950c7c3d4ef537260f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,18 @@
-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 \
+            version