Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d86d6e66f238ff51569f22c6f3d1f90e213b25d..8815acebe02ce2924cab22e45a231caa0175723e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,9 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttsessiondcomm \
+SUBDIRS = benchmark \
+                 liblttng-sessiond-comm \
                  libkernelctl \
-                 liblttkconsumerd \
+                 liblttngkconsumerd \
                  liblttngctl \
                  libustcomm \
                  libustctl \
@@ -10,4 +11,8 @@ SUBDIRS = liblttsessiondcomm \
                  ltt-kconsumerd \
                  ltt-sessiond \
                  tests \
-                 include
+                 include \
+                 doc
+
+bench:
+       ./benchmark/runall.sh