Merge master branch

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index df3067e0225a3fce67c9e1fd5c8d65961bdcba28..279a73ae53ccc2370c6e37363830065c9ff9a1f9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,18 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttng-sessiond-comm \
+SUBDIRS = benchmark \
+                 liblttng-sessiond-comm \
                  libkernelctl \
-                 liblttkconsumerd \
+                 liblttng-kconsumer \
+                 liblttng-ustconsumer \
+                 liblttng-consumer \
+                 lttng-consumerd \
                  liblttngctl \
-                 libustcomm \
-                 libustctl \
                  lttng \
-                 ltt-kconsumerd \
-                 ltt-sessiond \
+                 lttng-sessiond \
                  tests \
                  include \
                  doc
+
+bench:
+       ./benchmark/runall.sh