X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=Makefile.am;h=39b9f2f94aadc8557955d45cce1713ebbdbc8b20;hp=ec8b7fe95ac0a24e471a81a7024d4305a84ef161;hb=daf282ab93462198c6acd16b4aa624635df1bea5;hpb=6533b585a3a53a0b52c2da14baec5e874d1bf3bb

diff --git a/Makefile.am b/Makefile.am
index ec8b7fe95..39b9f2f94 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 \
-		  liblttngkconsumerd \
-		  liblttngctl \
-		  libustcomm \
-		  libustctl \
-		  lttng \
-		  ltt-kconsumerd \
-		  ltt-sessiond \
-		  tests \
-		  include \
-		  doc
+		  librunas \
+		  liblttng-kconsumer \
+		  liblttng-ustconsumer \
+		  liblttng-consumer \
+		  lttng-consumerd
+
+if ! BUILD_CONSUMERD_ONLY
+SUBDIRS += liblttngctl \
+           lttng \
+           lttng-sessiond
+endif
+
+SUBDIRS += tests \
+           include \
+           doc