Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 44f17148b73a06ffb49577d4710b40c53442f3b2..bab695466d212894d07d9416e20bfda017e67342 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,13 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttng-sessiond-comm \
-                 libkernelctl \
-                 liblttng-kconsumer \
-                 liblttng-ustconsumer \
-                 liblttng-consumer \
-                 lttng-consumerd \
-                 liblttngctl \
-                 lttng \
-                 lttng-sessiond \
+SUBDIRS = src/common/ \
+                 benchmark \
+                 src \
                  tests \
                  include \
                  doc
+
+bench:
+       ./benchmark/runall.sh
+
+dist_doc_DATA = ChangeLog