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

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