Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

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