X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=Makefile.am;h=3b6344fa6cc271517eeb24c52de6236cafb8777d;hb=5fb528f1fdb74ddc70706a1c786efa2debe7bf16;hp=df3067e0225a3fce67c9e1fd5c8d65961bdcba28;hpb=ca3c5ac0cf100d80352a1a81936b5adc47942f35;p=lttng-tools.git

diff --git a/Makefile.am b/Makefile.am
index df3067e02..3b6344fa6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,14 +1,20 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = liblttng-sessiond-comm \
+SUBDIRS = common \
+		  liblttng-sessiond-comm \
 		  libkernelctl \
-		  liblttkconsumerd \
-		  liblttngctl \
-		  libustcomm \
-		  libustctl \
-		  lttng \
-		  ltt-kconsumerd \
-		  ltt-sessiond \
-		  tests \
-		  include \
-		  doc
+		  liblttng-ht \
+		  liblttng-kconsumer \
+		  liblttng-ustconsumer \
+		  liblttng-consumer \
+		  lttng-consumerd
+
+if ! BUILD_CONSUMERD_ONLY
+SUBDIRS += liblttngctl \
+           lttng \
+           lttng-sessiond
+endif
+
+SUBDIRS += tests \
+           include \
+           doc