Simplify use of DIST_SUBDIRS (#1309)

automake only needs the DIST_SUBDIRS list to be set 'manually' when
the SUBDIRS list is built using AC_SUBST variables.

For Makefile.am which exclusively use AC_CONDITIONAL we can leave
the DIST_SUBDIRS construction to automake.

diff --git a/Makefile.am b/Makefile.am
index 3c26dfc798f3b188211d91fc70da185a861e9be4..2487ac48f0298e120c4c8ff3968b375c1c86a906 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,12 +6,14 @@
 ##
 
 AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
-DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc src test-suite tools
-SUBDIRS                = compat lib
+
+SUBDIRS = compat contrib doc errors icons
+
 if ENABLE_LOADABLE_MODULES
 SUBDIRS += libltdl
 endif
-SUBDIRS += scripts icons errors doc 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/contrib/Makefile.am b/contrib/Makefile.am
index e573ef8e86555176df9cb52681197ea14386d6c0..0bf454c35a0b26534298615d027cd3f54c24bd76 100644 (file)
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -22,8 +22,6 @@ EXTRA_DIST = \
 
 all:
 
-install: install-@host_os@
-
 install-hpux10.10 install-hpux10.20:
        $(INSTALL_BIN) $(SQUID_RC) /sbin/init.d/squid
        $(INSTALL_FILE) $(SQUID_OPTIONS) /etc/rc.config.d/squid

diff --git a/lib/Makefile.am b/lib/Makefile.am
index c6fcd08ca27ddc5135e8cae6e7ea4f57ec243e23..3d0b929c8e091a425f68ca1984b024c07ed3a46b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,7 +7,6 @@
 
 include $(top_srcdir)/src/Common.am
 
-DIST_SUBDIRS = ntlmauth rfcnb smblib libTrie snmplib
 SUBDIRS=
 EXTRA_DIST=
 

diff --git a/lib/libTrie/Makefile.am b/lib/libTrie/Makefile.am
index 34ba0ea8c6152716c1e4bffc2fecfa0620d25c9a..d3d849bd94efaa1961176dead0f422657e3fdfc3 100644 (file)
--- a/lib/libTrie/Makefile.am
+++ b/lib/libTrie/Makefile.am
@@ -8,7 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-DIST_SUBDIRS = . test
 SUBDIRS = . test
 
 noinst_LIBRARIES = libTrie.a

diff --git a/src/DiskIO/Makefile.am b/src/DiskIO/Makefile.am
index 2753f4deb90d662989ed905c722dcd1962938470..a21ebd448d60e39b66673f43d273c950649d262a 100644 (file)
--- a/src/DiskIO/Makefile.am
+++ b/src/DiskIO/Makefile.am
@@ -9,7 +9,6 @@ include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
 SUBDIRS=
-DIST_SUBDIRS= AIO Blocking DiskDaemon DiskThreads IpcIo Mmapped
 
 noinst_LTLIBRARIES = libdiskio.la
 

diff --git a/src/Makefile.am b/src/Makefile.am
index 4885c12213f430e8a150e9089a8c7cbed00afbc5..9cf56dfcba2a7fdbf1cbff128d88fd4f4c671c0b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -17,17 +17,14 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h
 
 SUBDIRS = mem time debug base anyp helper dns ftp parser comm error eui acl format clients sbuf servers fs repl store DiskIO proxyp
-DIST_SUBDIRS = mem time debug base anyp helper dns ftp parser comm error eui acl format clients sbuf servers fs repl store DiskIO proxyp
 
 if ENABLE_AUTH
 SUBDIRS += auth
 AUTH_LIBS= auth/libauth.la
 AUTH_ACL_LIBS= auth/libacls.la
 endif
-DIST_SUBDIRS += auth
 
 SUBDIRS        += http ip icmp ident log ipc mgr
-DIST_SUBDIRS += http ip icmp ident log ipc mgr
 
 SSL_LIBS=
 if ENABLE_SSL
@@ -36,7 +33,6 @@ SSL_LIBS += \
        ssl/libsslsquid.la \
        ssl/libsslutil.la
 endif
-DIST_SUBDIRS += ssl security
 SUBDIRS += security
 
 SNMP_ALL_SOURCE = \
@@ -52,12 +48,10 @@ SNMP_LIBS = snmp/libsnmp.la $(SNMPLIB)
 else
 SNMP_SOURCE =
 endif
-DIST_SUBDIRS += snmp
 
 if ENABLE_ADAPTATION
 SUBDIRS += adaptation
 endif
-DIST_SUBDIRS += adaptation
 
 if ENABLE_ESI
 SUBDIRS += esi
@@ -69,7 +63,6 @@ ESI_LIBS = \
 else
 ESI_LIBS =
 endif
-DIST_SUBDIRS += esi
 
 DELAY_POOL_ALL_SOURCE = \
        BandwidthBucket.cc \

diff --git a/src/adaptation/Makefile.am b/src/adaptation/Makefile.am
index 4c21cbc824bfc75a26c4cc31ee469dd579b8194e..87fa8bead7da0e268b56c76454acf2adc25a70fd 100644 (file)
--- a/src/adaptation/Makefile.am
+++ b/src/adaptation/Makefile.am
@@ -8,7 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-DIST_SUBDIRS= ecap icap
 SUBDIRS =
 
 noinst_LTLIBRARIES = libadaptation.la

diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index b3ad1050791ecfc28b6e61e2283b6cbddde28c68..492fb23e734e0c6b3339641512b4f53484d688d5 100644 (file)
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -9,7 +9,6 @@ include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
 SUBDIRS = one url_rewriters
-DIST_SUBDIRS = one url_rewriters
 
 noinst_LTLIBRARIES = libhttp.la