Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

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