From d29c5b3e60370472b77ddb99cad2301385fa3e7e Mon Sep 17 00:00:00 2001 From: Francesco Chemolli Date: Sun, 18 Aug 2024 22:48:08 +0200 Subject: [PATCH] Maintenance: split SUBDIRS in Makefile.am Single-line SUBDIR clauses can be hard to manage. Split them into multiple lines with continuations. --- Makefile.am | 14 +++++++++++-- src/Makefile.am | 33 ++++++++++++++++++++++++++++-- src/auth/Makefile.am | 6 +++++- src/auth/digest/Makefile.am | 6 +++++- src/auth/negotiate/Makefile.am | 5 ++++- src/auth/ntlm/Makefile.am | 5 ++++- src/http/Makefile.am | 4 +++- src/http/url_rewriters/Makefile.am | 4 +++- src/log/Makefile.am | 4 +++- src/security/Makefile.am | 4 +++- tools/Makefile.am | 6 +++++- 11 files changed, 78 insertions(+), 13 deletions(-) diff --git a/Makefile.am b/Makefile.am index 2487ac48f02..ab813e7395a 100644 --- 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 3058e6f5f08..14f1b8e4d93 100644 --- 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 560bf3dadd8..f18cbb93ef9 100644 --- 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 0c74ad7d284..d612590ec8d 100644 --- 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 558fe3932a0..4bd7de1655b 100644 --- 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 b2a1176f70f..b8896fc684c 100644 --- 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 a976b2024d5..ef91f9bc217 100644 --- 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 bff007d6d59..f91b86d2be1 100644 --- 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 44e870bf617..6933f9a281f 100644 --- 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 df152d5a995..6ec947aa8bd 100644 --- 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 dc09ace40eb..c96f9cf5b3b 100644 --- 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