Sync ax_have_epoll.m4 with autoconf-archive

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index ec8b7fe95ac0a24e471a81a7024d4305a84ef161..552fe510b33363fad4dadf950c7c3d4ef537260f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,18 @@
-ACLOCAL_AMFLAGS = -I config
-
-SUBDIRS = liblttng-sessiond-comm \
-                 libkernelctl \
-                 liblttngkconsumerd \
-                 liblttngctl \
-                 libustcomm \
-                 libustctl \
-                 lttng \
-                 ltt-kconsumerd \
-                 ltt-sessiond \
-                 tests \
-                 include \
-                 doc
+ACLOCAL_AMFLAGS = -I m4
+
+DIST_SUBDIRS = include doc src extras tests
+
+SUBDIRS = include doc src tests
+
+if BUILD_EXTRAS
+SUBDIRS += extras
+endif
+
+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 \
+            version