Use automake subdir-objects feature

Now that there are no longer cross-directory collisions in the built
binaries or libraries we can enable this feature from ./configure
instead of on a per-Makefile basis

diff --git a/Makefile.am b/Makefile.am
index 3d4c70101804c249bd0f86b684d2677f3a0209c1..af93898b34495307f9454395c4ed11156befffed 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AUTOMAKE_OPTIONS = dist-bzip2 subdir-objects 1.5 foreign
+AUTOMAKE_OPTIONS = dist-bzip2 1.5 foreign
 DIST_SUBDIRS   = compat lib libltdl scripts icons errors contrib doc helpers src test-suite tools
 SUBDIRS                = compat lib
 if ENABLE_LOADABLE_MODULES

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 3edb18c0e4207ac45aefc098b16e0ed7b869615b..f272650ec6c66e2345f5b4a3d6a758f3a8943689 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -10,8 +10,6 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 # Ideally this would be 100% inline functions and macro wrappers.
 
 # Port Specific Configurations

diff --git a/configure.ac b/configure.ac
index 53e95dccbe5e181af81a95ec493e20f91ab72845..84cec41d455b81bf0f89c08066dc69d3f4aa4067 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_PREREQ(2.61)
 AC_CONFIG_HEADERS([include/autoconf.h])
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
-AM_INIT_AUTOMAKE([tar-ustar nostdinc])
+AM_INIT_AUTOMAKE([tar-ustar nostdinc subdir-objects])
 AC_REVISION($Revision$)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 804c1a5213c533fccbdf68971883119322ef918f..2bc473554eea3f1f152c60d55e81aed97e25ce7a 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -7,8 +7,6 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib
 SUBDIRS=
 EXTRA_DIST=

diff --git a/src/Makefile.am b/src/Makefile.am
index 48281d15797ef1294e2cbdb4e2644b37c528f66e..976ce1bba5cdb9b99cf34c65b14a09661b67ba95 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -7,8 +7,6 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 DNSSOURCE = \
        dns_internal.cc
 

diff --git a/src/dns/Makefile.am b/src/dns/Makefile.am
index 1f9921af18a60b0987d81f16e5b0dbedceeadc7f..6ea51e2e49217ac55a6abf5ce51f2e71d17f7111 100644 (file)
--- a/src/dns/Makefile.am
+++ b/src/dns/Makefile.am
@@ -8,8 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 noinst_LTLIBRARIES = libdns.la
 
 libdns_la_SOURCES = \

diff --git a/src/fs/Makefile.am b/src/fs/Makefile.am
index 7c649ce774471d33dde2cd51822bae54c6633378..6821f279c23ed26a037cc0d9943a4c609bae5b9c 100644 (file)
--- a/src/fs/Makefile.am
+++ b/src/fs/Makefile.am
@@ -7,8 +7,6 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 EXTRA_LTLIBRARIES = libaufs.la libdiskd.la libufs.la librock.la
 noinst_LTLIBRARIES =  $(STORE_LIBS_TO_BUILD) libfs.la
 

diff --git a/src/http/Makefile.am b/src/http/Makefile.am
index 4ede3861f4424ecb50e3a895ffa1993b79bb9130..68ec52d57e2fcc6d5149ed049ec2fc930d1df8dc 100644 (file)
--- a/src/http/Makefile.am
+++ b/src/http/Makefile.am
@@ -8,8 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 SUBDIRS = one
 DIST_SUBDIRS = one
 

diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index 0d5f9c67fadc414322819b72f379a9d753f26f56..28d23176b8cc871541bf763a707d8d8b1e1e467f 100644 (file)
--- a/src/ipc/Makefile.am
+++ b/src/ipc/Makefile.am
@@ -8,8 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 noinst_LTLIBRARIES = libipc.la
 
 libipc_la_SOURCES = \

diff --git a/src/repl/Makefile.am b/src/repl/Makefile.am
index 97ae3223613d1452819376aa2930a375678c3fff..385ec612982b803be142320c81c8361bc36e5399 100644 (file)
--- a/src/repl/Makefile.am
+++ b/src/repl/Makefile.am
@@ -10,8 +10,6 @@ include $(top_srcdir)/src/Common.am
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 # No recursion is needed for the subdirs, we build from here.
 
 EXTRA_LIBRARIES = liblru.a libheap.a

diff --git a/src/snmp/Makefile.am b/src/snmp/Makefile.am
index 4c986f62d3d2cdc2eefdc37539212b1e7c5b92e1..28f85d6499bff3dbcb3b874b20fddb6a56f5064f 100644 (file)
--- a/src/snmp/Makefile.am
+++ b/src/snmp/Makefile.am
@@ -8,7 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-
 noinst_LTLIBRARIES = libsnmp.la
 
 libsnmp_la_SOURCES = \

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index d27736243301b15d57106dff0212dac0fe888f89..fd4b7606837e492b611f0da92a34f6aa5f879202 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -7,8 +7,6 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 73b386155c25055682f4626b916f072fa186c84b..a19811a92f630928acc9c45fbb54c417c77e1e91 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -7,17 +7,15 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 
-SUBDIRS = helper-mux purge squidclient systemd sysvinit
-EXTRA_DIST = 
-man_MANS = 
-DISTCLEANFILES = 
+SUBDIRS= helper-mux purge squidclient systemd sysvinit
+EXTRA_DIST=
+man_MANS=
+DISTCLEANFILES=
 
-LDADD = \
+LDADD= \
        $(top_builddir)/src/ip/libip.la \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \

diff --git a/tools/squidclient/Makefile.am b/tools/squidclient/Makefile.am
index 4a3b9874186eb3f39aabd63fbd60998cd53e6d51..a509058c883b61472bdead84a84d0e9f6046df2e 100644 (file)
--- a/tools/squidclient/Makefile.am
+++ b/tools/squidclient/Makefile.am
@@ -7,12 +7,10 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
-SUBDIRS = 
+SUBDIRS =
 EXTRA_DIST = squidclient.1
 man_MANS = squidclient.1
-DISTCLEANFILES = 
+DISTCLEANFILES =
 
 LDADD = \
        $(top_builddir)/src/ip/libip.la \

diff --git a/tools/systemd/Makefile.am b/tools/systemd/Makefile.am
index 3852fcdcb06a6035022dde81dc4cae7cd5d468a4..95a40810e849c5526409b70072e1c2879354b1a0 100644 (file)
--- a/tools/systemd/Makefile.am
+++ b/tools/systemd/Makefile.am
@@ -5,6 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 EXTRA_DIST = squid.service

diff --git a/tools/sysvinit/Makefile.am b/tools/sysvinit/Makefile.am
index 823a5280a1f7d0de1d1eff860fe9dbe7cc403a1d..c879a45febecf18d3ccd45ecd0476122bcf6ce69 100644 (file)
--- a/tools/sysvinit/Makefile.am
+++ b/tools/sysvinit/Makefile.am
@@ -5,6 +5,4 @@
 ## Please see the COPYING and CONTRIBUTORS files for details.
 ##
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 EXTRA_DIST = squid.rc