X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2FMakefile.am;h=73cfac7b76986076f031299fc630f498ac375c9d;hp=ce5057dd7512c007dccb6ca9fa36287f10d9b002;hb=287a512f2b868c16132b894a8143a5faf0379ca8;hpb=b8aa16822f579a6e15b41d2761801a0a65d5f2a5

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index ce5057dd7..73cfac7b7 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,9 +1,28 @@
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = lttng-consumerd
+SUBDIRS =
 
-if ! BUILD_CONSUMERD_ONLY
-SUBDIRS += lttng \
-           lttng-sessiond \
-           lttng-relayd
+# Make sure to always distribute all folders
+# since SUBDIRS is decided at configure time.
+DIST_SUBDIRS = lttng-consumerd lttng lttng-sessiond lttng-relayd \
+	       lttng-crash
+
+if BUILD_BIN_LTTNG
+SUBDIRS += lttng
+endif
+
+if BUILD_BIN_LTTNG_CONSUMERD
+SUBDIRS += lttng-consumerd
+endif
+
+if BUILD_BIN_LTTNG_CRASH
+SUBDIRS += lttng-crash
+endif
+
+if BUILD_BIN_LTTNG_RELAYD
+SUBDIRS += lttng-relayd
+endif
+
+if BUILD_BIN_LTTNG_SESSIOND
+SUBDIRS += lttng-sessiond
 endif