Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fa5beea9a9df6ddd0d5cdcdd4ee1d7ea0191cbb2..ae88bcaa0cadc5a541533cd7dbb27bdd8d3d76d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttng-sessiond-comm \
+SUBDIRS = benchmark \
+                 liblttng-sessiond-comm \
                  libkernelctl \
                  liblttng-kconsumer \
                  liblttng-ustconsumer \
@@ -16,3 +17,6 @@ endif
 SUBDIRS += tests \
            include \
            doc
+
+bench:
+       ./benchmark/runall.sh