Fix multiple error handling for UST tracing

[lttng-tools.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 1335794139d757e005ddc680c88b1684d910ce3c..3b6344fa6cc271517eeb24c52de6236cafb8777d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,20 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttsessiondcomm \
+SUBDIRS = common \
+                 liblttng-sessiond-comm \
                  libkernelctl \
-                 liblttngctl \
-                 libustcomm \
-                 libustctl \
-                 lttng \
-                 ltt-sessiond \
-                 kconsumerd \
-                 tests
+                 liblttng-ht \
+                 liblttng-kconsumer \
+                 liblttng-ustconsumer \
+                 liblttng-consumer \
+                 lttng-consumerd
+
+if ! BUILD_CONSUMERD_ONLY
+SUBDIRS += liblttngctl \
+           lttng \
+           lttng-sessiond
+endif
+
+SUBDIRS += tests \
+           include \
+           doc