Fix: include stdlib.h in compat/string.h

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b0537ce6e4f4ea55b049966c33ae64fecc9e35ab..d627c840d9e8b7243de0ab004d3e5e9bb49d8d76 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,23 @@
-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 \
+            LICENSES/BSD-2-Clause \
+            LICENSES/BSD-3-Clause \
+            LICENSES/GPL-2.0 \
+            LICENSES/LGPL-2.1 \
+            LICENSES/MIT \
+            version