From 625edbf5ce4b31da345107c24a619651e9a7a4e5 Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Mon, 22 Nov 2021 14:43:09 -0500 Subject: [PATCH] Cleanup: DIST_SUBDIRS is redundant when using AM conditionals MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Jérémie Galarneau --- Makefile.am | 2 -- src/bin/Makefile.am | 7 ------- src/lib/Makefile.am | 2 -- tests/Makefile.am | 1 - 4 files changed, 12 deletions(-) diff --git a/Makefile.am b/Makefile.am index cf91f0f92..636296e46 100644 --- 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 8c5803494..146f273de 100644 --- 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 19db96361..f6ec8bbd7 100644 --- 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 8f5c15d34..9fd13005a 100644 --- 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 -- 2.34.1