make: use DIST_SUBDIRS

As per automake manual[1], DIST_SUBDIRS should be used to recurse into
the subdirectories those we want to ship as part of make dist and use
SUBDIRS for conditionally building the directories. Adopt this rule
across the source.

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

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>

diff --git a/Makefile.am b/Makefile.am
index 2ab44f35bbb9d4f3b49d0d3f25991266c5becd8f..277e74022090a36be9d8a8407094c70a0b75b52e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,7 @@
 AUTOMAKE_OPTIONS = foreign
 ACLOCAL_AMFLAGS= -I m4
-SUBDIRS = dist doc include samples scripts src
-if WITH_TESTS
-SUBDIRS += tests
-endif
+DIST_SUBDIRS = dist doc include scripts src tests samples
+SUBDIRS = $(DIST_SUBDIRS)
 
 EXTRA_DIST = README_daemon libcgroup.doxyfile README_systemd CONTRIBUTING.md
 

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 5822dc16435c260d9bea292edb91db1217bfb084..e439614120391e8595216e09bc76bd2a659d1cc4 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,2 +1,3 @@
-SUBDIRS = man
+DIST_SUBDIRS = man
+SUBDIRS = $(DIST_SUBDIRS)
 

diff --git a/samples/Makefile.am b/samples/Makefile.am
index 23f64d691b5359742f115601a4ae0cdcad34de9e..5c5566c597f16ae6ce1083073d5e4e13ed20dbfe 100644 (file)
--- a/samples/Makefile.am
+++ b/samples/Makefile.am
@@ -1 +1,2 @@
-SUBDIRS = config c
+DIST_SUBDIRS = config c
+SUBDIRS = $(DIST_SUBDIRS)

diff --git a/src/Makefile.am b/src/Makefile.am
index 8c9b674acea0adc375ee498751a86082a28dba50..6a838f1ea6f023b18a89a07f73ded5707a1c92f1 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,6 +2,7 @@
 
 BUILT_SOURCES = parse.c parse.h
 
+DIST_SUBDIRS = . daemon pam tools python
 SUBDIRS = . daemon pam tools
 if ENABLE_PYTHON
 SUBDIRS += python