Cleanup: DIST_SUBDIRS is redundant when using AM conditionals

From automake's documentation[1] :

  If SUBDIRS is defined conditionally using Automake conditionals,
  Automake will define DIST_SUBDIRS automatically from the possible
  values of SUBDIRS in all conditions.

[1] https://www.gnu.org/software/automake/manual/html_node/SUBDIRS-vs-DIST_005fSUBDIRS.html

Change-Id: I8495f1f4452ccde4920ecd63bfd37de4eb10c281
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/Makefile.am b/Makefile.am
index cf91f0f923b624fc32b0bda0aa0128ddcc93528f..636296e46e7e017fde3cce19377a875687bdeb8c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,8 +2,6 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-DIST_SUBDIRS = include doc src extras tests doc/examples
-
 # `doc/examples` is placed last since it requires artifact from `src` and
 # `src` can require artifact from `doc` (--enable-embedded-help).
 SUBDIRS = include doc src tests doc/examples

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 8c5803494ad3697b959c075c6dcd5835619a125e..146f273dea8f9f1e404a73166d0330f125b164e7 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,14 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
-ACLOCAL_AMFLAGS = -I config
-
 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

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 19db9636167ecfbbce243dd779f6e11e614d3bca..f6ec8bbd76471466fe69567dd2d19c88bd445d59 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -2,8 +2,6 @@
 
 SUBDIRS =
 
-DIST_SUBDIRS = lttng-ctl
-
 if BUILD_LIB_LTTNG_CTL
 SUBDIRS += lttng-ctl
 endif

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 8f5c15d34984eacea5519940a437de93544a628b..9fd13005a2bcfee426a17f7271775b4181aedbf7 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0-only
 
 SUBDIRS =
-DIST_SUBDIRS = utils unit regression stress destructive perf
 
 if BUILD_TESTS
 SUBDIRS += . utils unit regression stress destructive perf