Maintenance: split SUBDIRS in Makefile.am (#1888)

Single-line multi-entry SUBDIRS often increase management noise.

diff --git a/Makefile.am b/Makefile.am
index 2487ac48f0298e120c4c8ff3968b375c1c86a906..ab813e7395aab6ba3bfad97012293caaa69559d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,13 +7,23 @@
 
 AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
 
-SUBDIRS = compat contrib doc errors icons
+SUBDIRS = \
+       compat \
+       contrib \
+       doc \
+       errors \
+       icons
 
 if ENABLE_LOADABLE_MODULES
 SUBDIRS += libltdl
 endif
 
-SUBDIRS += lib scripts src tools test-suite
+SUBDIRS += \
+       lib \
+       scripts \
+       src \
+       tools \
+       test-suite
 
 DISTCLEANFILES = include/stamp-h include/stamp-h[0-9]*
 DEFAULT_PINGER = $(libexecdir)/`echo pinger | sed '$(transform);s/$$/$(EXEEXT)/'`

diff --git a/src/Makefile.am b/src/Makefile.am
index 3058e6f5f08fa8d800168a825f6465b1994b7b88..9ad4612190401240b6b480737afa99665b03f67a 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,7 +17,30 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h
 
 # subdir Y that requires a file built in subdir X must appear after X
-SUBDIRS = mem time debug base anyp helper dns html ftp parser comm error eui sbuf acl format clients servers fs repl store DiskIO proxyp
+SUBDIRS = \
+       mem \
+       time \
+       debug \
+       base \
+       anyp \
+       helper \
+       dns \
+       html \
+       ftp \
+       parser \
+       comm \
+       error \
+       eui \
+       sbuf \
+       acl \
+       format \
+       clients \
+       servers \
+       fs \
+       repl \
+       store \
+       DiskIO \
+       proxyp
 
 if ENABLE_AUTH
 SUBDIRS += auth
@@ -25,7 +48,13 @@ AUTH_LIBS= auth/libauth.la
 AUTH_ACL_LIBS= auth/libacls.la
 endif
 
-SUBDIRS        += http ip icmp log ipc mgr
+SUBDIRS += \
+       http \
+       ip \
+       icmp \
+       log \
+       ipc \
+       mgr
 
 SSL_LIBS=
 if ENABLE_SSL

diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am
index 560bf3dadd8299eca7aa4e7cce3a0ab94e8a0d7c..f18cbb93ef9000d7b0e9cae8881e8b390a430af8 100644 (file)
--- a/src/auth/Makefile.am
+++ b/src/auth/Makefile.am
@@ -8,7 +8,11 @@
 include $(top_srcdir)/src/Common.am
 
 SUBDIRS = $(AUTH_MODULES)
-DIST_SUBDIRS = basic digest negotiate ntlm
+DIST_SUBDIRS = \
+       basic \
+       digest \
+       negotiate \
+       ntlm
 
 noinst_LTLIBRARIES = libauth.la libacls.la
 ## not needed? $(AUTH_LIBS_TO_BUILD)

diff --git a/src/auth/digest/Makefile.am b/src/auth/digest/Makefile.am
index 0c74ad7d2843f74454e8d74bc5465cea3d1356d3..d612590ec8d8a3bfc7c7d37bae0f7c0d99151749 100644 (file)
--- a/src/auth/digest/Makefile.am
+++ b/src/auth/digest/Makefile.am
@@ -7,7 +7,11 @@
 
 include $(top_srcdir)/src/Common.am
 
-DIST_SUBDIRS= eDirectory file LDAP
+DIST_SUBDIRS = \
+       eDirectory \
+       file \
+       LDAP
+
 SUBDIRS= $(DIGEST_AUTH_HELPERS)
 EXTRA_DIST= helpers.m4
 

diff --git a/src/auth/negotiate/Makefile.am b/src/auth/negotiate/Makefile.am
index 558fe3932a0629d99c7f1bc45c4807833da14988..4bd7de1655b06aed8ee932fbc01e9cd9d4056f4b 100644 (file)
--- a/src/auth/negotiate/Makefile.am
+++ b/src/auth/negotiate/Makefile.am
@@ -7,7 +7,10 @@
 
 include $(top_srcdir)/src/Common.am
 
-DIST_SUBDIRS= kerberos SSPI wrapper
+DIST_SUBDIRS = \
+       kerberos \
+       SSPI \
+       wrapper
 SUBDIRS= $(NEGOTIATE_AUTH_HELPERS)
 EXTRA_DIST= helpers.m4
 

diff --git a/src/auth/ntlm/Makefile.am b/src/auth/ntlm/Makefile.am
index b2a1176f70fa823de7483fc0bade8f5ad486bcbd..b8896fc684ce6727c2406042743cc93ca5ae9449 100644 (file)
--- a/src/auth/ntlm/Makefile.am
+++ b/src/auth/ntlm/Makefile.am
@@ -7,7 +7,10 @@
 
 include $(top_srcdir)/src/Common.am
 
-DIST_SUBDIRS= fake SMB_LM SSPI
+DIST_SUBDIRS = \
+       fake \
+       SMB_LM \
+       SSPI
 SUBDIRS= $(NTLM_AUTH_HELPERS)
 EXTRA_DIST= helpers.m4
 

diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index a976b2024d5291b458cdeb565425e55c92f34e77..ef91f9bc217fc5b0a170e48a941a1dfd92d5ae75 100644 (file)
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -7,7 +7,9 @@
 
 include $(top_srcdir)/src/Common.am
 
-SUBDIRS = one url_rewriters
+SUBDIRS = \
+       one \
+       url_rewriters
 
 noinst_LTLIBRARIES = libhttp.la
 

diff --git a/src/http/url_rewriters/Makefile.am b/src/http/url_rewriters/Makefile.am
index bff007d6d59f185828dde527bc0577b66c480c49..f91b86d2be1a81efa87d11e259432408a1cffe8b 100644 (file)
--- a/src/http/url_rewriters/Makefile.am
+++ b/src/http/url_rewriters/Makefile.am
@@ -5,5 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-DIST_SUBDIRS= fake LFS
+DIST_SUBDIRS = \
+    fake \
+    LFS
 SUBDIRS= $(URL_REWRITE_HELPERS)

diff --git a/src/log/Makefile.am b/src/log/Makefile.am
index 44e870bf6177f7a17f31fb1c8fb03f474b48c502..6933f9a281faa847acab18933554dd08fc25226c 100644 (file)
--- a/src/log/Makefile.am
+++ b/src/log/Makefile.am
@@ -7,7 +7,9 @@
 
 include $(top_srcdir)/src/Common.am
 
-DIST_SUBDIRS= DB file
+DIST_SUBDIRS = \
+       DB \
+       file
 SUBDIRS= $(LOG_DAEMON_HELPERS)
 EXTRA_DIST= helpers.m4
 

diff --git a/src/security/Makefile.am b/src/security/Makefile.am
index df152d5a995b49aa5a71d53a15ec7764988fed36..6ec947aa8bdf27f1713d3e58452278304225aaed 100644 (file)
--- a/src/security/Makefile.am
+++ b/src/security/Makefile.am
@@ -7,7 +7,9 @@
 
 include $(top_srcdir)/src/Common.am
 
-SUBDIRS= cert_generators cert_validators
+SUBDIRS = \
+       cert_generators \
+       cert_validators
 
 noinst_LTLIBRARIES = libsecurity.la
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index dc09ace40eb400e9a115cffb7635aab97d27bf9c..c96f9cf5b3b0007e541a55b602b7c69e7beec92c 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -5,5 +5,9 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-SUBDIRS = apparmor helper-mux systemd sysvinit
+SUBDIRS = \
+    apparmor \
+    helper-mux \
+    systemd \
+    sysvinit
 EXTRA_DIST = helper-ok-dying.pl helper-ok.pl