From: Amos Jeffries Date: Mon, 3 Aug 2015 03:50:25 +0000 (-0700) Subject: Use automake subdir-objects feature X-Git-Tag: merge-candidate-3-v1^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4405bd38b167f0777800ae2ecf04c8c5eca9b9e;p=thirdparty%2Fsquid.git 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 3d4c701018..af93898b34 100644 --- 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 3edb18c0e4..f272650ec6 100644 --- 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 53e95dccbe..84cec41d45 100644 --- 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 804c1a5213..2bc473554e 100644 --- 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 48281d1579..976ce1bba5 100644 --- 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 1f9921af18..6ea51e2e49 100644 --- 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 7c649ce774..6821f279c2 100644 --- 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 4ede3861f4..68ec52d57e 100644 --- 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 0d5f9c67fa..28d23176b8 100644 --- 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 97ae322361..385ec61298 100644 --- 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 4c986f62d3..28f85d6499 100644 --- 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 d277362433..fd4b760683 100644 --- 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 73b386155c..a19811a92f 100644 --- 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 4a3b987418..a509058c88 100644 --- 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 3852fcdcb0..95a40810e8 100644 --- 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 823a5280a1..c879a45feb 100644 --- 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