Merge branch 'master' into benchmark

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3d86d6e66f238ff51569f22c6f3d1f90e213b25d..ae88bcaa0cadc5a541533cd7dbb27bdd8d3d76d1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,13 +1,22 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttsessiondcomm \
+SUBDIRS = benchmark \
+                 liblttng-sessiond-comm \
                  libkernelctl \
-                 liblttkconsumerd \
-                 liblttngctl \
-                 libustcomm \
-                 libustctl \
-                 lttng \
-                 ltt-kconsumerd \
-                 ltt-sessiond \
-                 tests \
-                 include
+                 liblttng-kconsumer \
+                 liblttng-ustconsumer \
+                 liblttng-consumer \
+                 lttng-consumerd
+
+if ! BUILD_CONSUMERD_ONLY
+SUBDIRS += liblttngctl \
+           lttng \
+           lttng-sessiond
+endif
+
+SUBDIRS += tests \
+           include \
+           doc
+
+bench:
+       ./benchmark/runall.sh