Revert "Fix: sessiond: erroneous user check logic in session_access_ok"

[lttng-tools.git] / src / bin / Makefile.am

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 07b694918c3d9a28b7d8531d8a8aed3561d1ff39..8c5803494ad3697b959c075c6dcd5835619a125e 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,8 +1,30 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
 ACLOCAL_AMFLAGS = -I config
 
-SUBDIRS = lttng-consumerd
+SUBDIRS =
+
+# 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_CONSUMERD_ONLY
-SUBDIRS += lttng \
-           lttng-sessiond
+if BUILD_BIN_LTTNG_SESSIOND
+SUBDIRS += lttng-sessiond
 endif