Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8815acebe02ce2924cab22e45a231caa0175723e..bab695466d212894d07d9416e20bfda017e67342 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,13 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = benchmark \
-                 liblttng-sessiond-comm \
-                 libkernelctl \
-                 liblttngkconsumerd \
-                 liblttngctl \
-                 libustcomm \
-                 libustctl \
-                 lttng \
-                 ltt-kconsumerd \
-                 ltt-sessiond \
+SUBDIRS = src/common/ \
+                 benchmark \
+                 src \
                  tests \
                  include \
                  doc
 
 bench:
        ./benchmark/runall.sh
+
+dist_doc_DATA = ChangeLog