www/squid
www/squid
1
0
Fork 0
mirror of https://github.com/squid-cache/squid.git synced 2025-04-18 22:04:07 +03:00
Code

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

Browse Source 
Single-line multi-entry SUBDIRS often increase management noise.
This commit is contained in:
Francesco Chemolli 2024-08-21 02:26:51 +00:00 committed by Squid Anubis
parent 5673f482e1
commit ebbcff2276
11 changed files with 78 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Makefile.am
View File

@ -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)/'`

33
src/Makefile.am
View File

@ -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

6
src/auth/Makefile.am
View File

@ -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)

6
src/auth/digest/Makefile.am
View File

@ -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

5
src/auth/negotiate/Makefile.am
View File

@ -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

5
src/auth/ntlm/Makefile.am
View File

@ -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

4
src/http/Makefile.am
View File

@ -7,7 +7,9 @@
include $(top_srcdir)/src/Common.am
SUBDIRS = one url_rewriters
SUBDIRS = \
one \
url_rewriters
noinst_LTLIBRARIES = libhttp.la

4
src/http/url_rewriters/Makefile.am
View File

@ -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)

4
src/log/Makefile.am
View File

@ -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

4
src/security/Makefile.am
View File

@ -7,7 +7,9 @@
include $(top_srcdir)/src/Common.am
SUBDIRS= cert_generators cert_validators
SUBDIRS = \
cert_generators \
cert_validators
noinst_LTLIBRARIES = libsecurity.la

6
tools/Makefile.am
View File

@ -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