------------------------------------------------------------ revno: 13881 revision-id: squid3@treenet.co.nz-20150808021824-jhjbujrrovbi3dty parent: squid3@treenet.co.nz-20150801060627-ajgkvphnyf6k1pb1 committer: Amos Jeffries branch nick: 3.5 timestamp: Fri 2015-08-07 19:18:24 -0700 message: Use automake subdir-objects feature The auto* toolchain warns that automake future versions will be enabling subdir-objects mechanism by default. Some unit tests were moved into per-library subdirs with the plan of keeping all convenience library code together. However the current layout state of Squid means that most still require some objects in other libraries or at the top level. This does not build happily with the auto-tools subdir-objects feature. In particular the distclean target has a tendency to erase objects twice and die on the second attempt. Temporarily undo that SourceLayout shuffing in order to be more compatible with automake 1.1n versions. Now that there are no longer cross-directory collisions in the built binaries or libraries we can enable subdir-objects from ./configure instead of on a per-Makefile basis ------------------------------------------------------------ # Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: squid3@treenet.co.nz-20150808021824-jhjbujrrovbi3dty # target_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # testament_sha1: 8a6324cbc99d84575f9c62ea1f68ed17dbfc74e8 # timestamp: 2015-08-08 02:50:56 +0000 # source_branch: http://bzr.squid-cache.org/bzr/squid3/3.5 # base_revision_id: squid3@treenet.co.nz-20150801060627-\ # ajgkvphnyf6k1pb1 # # Begin patch === modified file 'Makefile.am' --- Makefile.am 2015-01-13 09:13:49 +0000 +++ Makefile.am 2015-08-08 02:18:24 +0000 @@ -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 === modified file 'compat/Makefile.am' --- compat/Makefile.am 2015-01-13 09:13:49 +0000 +++ compat/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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 === modified file 'configure.ac' --- configure.ac 2015-08-01 06:06:27 +0000 +++ configure.ac 2015-08-08 02:18:24 +0000 @@ -10,7 +10,7 @@ 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 === modified file 'lib/Makefile.am' --- lib/Makefile.am 2015-01-13 09:13:49 +0000 +++ lib/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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= === modified file 'src/Makefile.am' --- src/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/Makefile.am 2015-08-08 02:18:24 +0000 @@ -7,8 +7,6 @@ include $(top_srcdir)/src/Common.am -AUTOMAKE_OPTIONS = subdir-objects - DNSSOURCE = \ dns_internal.cc \ SquidDns.h \ @@ -1069,13 +1067,17 @@ check_PROGRAMS+=\ tests/testBoilerplate \ tests/testCacheManager \ + tests/testCharacterSet \ tests/testDiskIO \ tests/testEvent \ tests/testEventLoop \ tests/test_http_range \ tests/testHttpParser \ + tests/testTokenizer \ tests/testHttpReply \ tests/testHttpRequest \ + tests/testIcmp \ + tests/testIpAddress \ tests/testStore \ tests/testString \ tests/testURL \ @@ -1390,6 +1392,24 @@ tests_testBoilerplate_DEPENDENCIES = \ $(SQUID_CPPUNIT_LA) +## Tests of base/libbase.la objects +tests_testCharacterSet_SOURCES = \ + tests/testCharacterSet.cc \ + tests/testCharacterSet.h +nodist_tests_testCharacterSet_SOURCES = \ + base/CharacterSet.h \ + $(TESTSOURCES) \ + tests/stub_cbdata.cc \ + tests/stub_debug.cc \ + tests/stub_MemBuf.cc +tests_testCharacterSet_LDFLAGS = $(LIBADD_DL) +tests_testCharacterSet_LDADD= \ + base/libbase.la \ + $(COMPAT_LIB) \ + $(SQUID_CPPUNIT_LA) \ + $(SQUID_CPPUNIT_LIBS) \ + $(XTRA_LIBS) + ## Tests of the CacheManager module. tests_testCacheManager_SOURCES = \ AccessLogEntry.cc \ @@ -2599,6 +2619,30 @@ tests_testHttpParser_DEPENDENCIES = \ $(SQUID_CPPUNIT_LA) +## Tests of parser/* objects +tests_testTokenizer_SOURCES = \ + tests/testTokenizer.h \ + tests/testTokenizer.cc +nodist_tests_testTokenizer_SOURCES = \ + parser/Tokenizer.h \ + $(SBUF_SOURCE) \ + SquidString.h \ + String.cc \ + $(TESTSOURCES) \ + tests/stub_debug.cc \ + tests/stub_mem.cc \ + tests/stub_time.cc \ + tests/stub_SBufDetailedStats.cc +tests_testTokenizer_LDFLAGS = $(LIBADD_DL) +tests_testTokenizer_LDADD = \ + parser/libsquid-parser.la \ + base/libbase.la \ + $(top_builddir)/lib/libmiscutil.la \ + $(COMPAT_LIB) \ + $(SQUID_CPPUNIT_LA) \ + $(SQUID_CPPUNIT_LIBS) \ + $(XTRA_LIBS) + ## Tests of the HttpRequest module. tests_testHttpRequest_SOURCES = \ AccessLogEntry.cc \ @@ -2841,6 +2885,44 @@ $(REPL_OBJS) \ $(SQUID_CPPUNIT_LA) +## Tests for icmp/* objects +# icmp/libicmp-core.la is used by pinger so SHOULD NOT require more dependancies! :-( +tests_testIcmp_SOURCES = \ + tests/testIcmp.h \ + tests/testIcmp.cc +nodist_tests_testIcmp_SOURCES = \ + icmp/Icmp.h \ + SquidTime.h \ + tests/stub_debug.cc \ + time.cc \ + globals.cc +tests_testIcmp_LDFLAGS = $(LIBADD_DL) +tests_testIcmp_LDADD=\ + icmp/libicmp-core.la \ + ip/libip.la \ + base/libbase.la \ + $(COMPAT_LIB) \ + $(SQUID_CPPUNIT_LA) \ + $(SQUID_CPPUNIT_LIBS) \ + $(XTRA_LIBS) + +## Tests for ip/* objects +tests_testIpAddress_SOURCES= \ + tests/testAddress.cc \ + tests/testAddress.h +nodist_tests_testIpAddress_SOURCES= \ + ip/Address.h \ + tests/stub_debug.cc \ + tests/stub_tools.cc +tests_testIpAddress_LDADD= \ + ip/libip.la \ + base/libbase.la \ + $(COMPAT_LIB) \ + $(SQUID_CPPUNIT_LA) \ + $(SQUID_CPPUNIT_LIBS) \ + $(XTRA_LIBS) +tests_testIpAddress_LDFLAGS= $(LIBADD_DL) + ## why so many sources? well httpHeaderTools requites ACLChecklist & friends. ## first line - what we are testing. tests_testStore_SOURCES= \ === modified file 'src/base/Makefile.am' --- src/base/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/base/Makefile.am 2015-08-08 02:18:24 +0000 @@ -21,7 +21,6 @@ AsyncCallQueue.h \ CharacterSet.h \ CharacterSet.cc \ - TidyPointer.h \ CbcPointer.h \ InstanceId.h \ Lock.h \ @@ -30,27 +29,5 @@ RunnersRegistry.h \ Subscription.h \ TextException.cc \ - TextException.h - -EXTRA_PROGRAMS = \ - testCharacterSet - -check_PROGRAMS += testCharacterSet -TESTS += testCharacterSet - -testCharacterSet_SOURCES = \ - CharacterSet.h \ - testCharacterSet.h \ - testCharacterSet.cc -nodist_testCharacterSet_SOURCES = \ - $(top_srcdir)/src/tests/stub_debug.cc \ - $(top_srcdir)/src/tests/stub_MemBuf.cc \ - $(top_srcdir)/src/tests/stub_cbdata.cc -testCharacterSet_LDFLAGS = $(LIBADD_DL) -testCharacterSet_LDADD=\ - $(SQUID_CPPUNIT_LIBS) \ - $(SQUID_CPPUNIT_LA) \ - libbase.la \ - $(COMPAT_LIB) \ - $(XTRA_LIBS) -testCharacterSet_DEPENDENCIES= $(SQUID_CPPUNIT_LA) + TextException.h \ + TidyPointer.h === modified file 'src/fs/Makefile.am' --- src/fs/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/fs/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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 === modified file 'src/icmp/Makefile.am' --- src/icmp/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/icmp/Makefile.am 2015-08-08 02:18:24 +0000 @@ -9,40 +9,20 @@ include $(top_srcdir)/src/TestHeaders.am # TODO: get rid of this when config filename is no longer a global constant. -# its only here so the testIcmp will link . +# its only here so the pinger globals.cc will link. DEFS += -DDEFAULT_CONFIG_FILE=NULL # ICMP Specific Configurations if ENABLE_PINGER -PINGER = pinger +libexec_PROGRAMS = pinger else -PINGER = +EXTRA_PROGRAMS = pinger endif -EXTRA_PROGRAMS = \ - pinger \ - testIcmp - -libexec_PROGRAMS = $(PINGER) - noinst_LTLIBRARIES = libicmp-core.la libicmp.la -SBUF_SOURCE= \ - $(top_srcdir)/src/base/CharacterSet.h \ - $(top_srcdir)/src/SBuf.h \ - $(top_srcdir)/src/SBuf.cc \ - $(top_srcdir)/src/MemBlob.h \ - $(top_srcdir)/src/MemBlob.cc \ - $(top_srcdir)/src/OutOfBoundsException.h \ - $(top_srcdir)/src/SBufExceptions.h \ - $(top_srcdir)/src/SBufExceptions.cc \ - $(top_srcdir)/src/String.cc \ - $(top_srcdir)/src/SquidString.h \ - $(top_srcdir)/src/base/TextException.h \ - $(top_srcdir)/src/base/TextException.cc - # ICMP API definition ... libicmp_core_la_SOURCES = \ Icmp.h \ @@ -56,6 +36,15 @@ net_db.h \ net_db.cc +# pinger depends on these but install/dist is done elsewhere. +COPIED_SOURCE= \ + debug.cc \ + globals.cc \ + SquidConfig.cc \ + SquidNew.cc \ + stub_HelperChildConfig.cc \ + time.cc + # ICMP lookup helper pinger_SOURCES = \ Icmp.h \ @@ -66,17 +55,7 @@ Icmp6.h \ Icmp6.cc \ pinger.cc - -# depends on these but install/dist is done elsewhere. -# TODO: remove when these are cleaned up in their own way. -nodist_pinger_SOURCES = \ - $(top_srcdir)/src/debug.cc \ - $(top_builddir)/src/globals.cc \ - $(top_srcdir)/src/time.cc \ - $(top_srcdir)/src/SquidConfig.cc \ - $(top_srcdir)/src/SquidNew.cc \ - $(top_srcdir)/src/tests/stub_HelperChildConfig.cc - +nodist_pinger_SOURCES = $(COPIED_SOURCE) pinger_LDFLAGS = $(LIBADD_DL) pinger_LDADD=\ libicmp-core.la \ @@ -84,6 +63,7 @@ $(COMPAT_LIB) \ $(XTRA_LIBS) +CLEANFILES += $(COPIED_SOURCE) ##install-pinger: ## @f=$(PINGER_EXE); \ @@ -98,29 +78,22 @@ ## $(RM) -f $(libexecdir)/-$$f; \ ## fi - -check_PROGRAMS += testIcmp -TESTS += testIcmp - -## Tests of the ICMP base module. -# Its used by pinger so SHOULD NOT require more dependancies! :-( -testIcmp_SOURCES = \ - Icmp.h \ - testIcmp.h \ - testIcmp.cc -nodist_testIcmp_SOURCES = \ - $(top_srcdir)/src/SquidTime.h \ - $(top_srcdir)/src/tests/stub_debug.cc \ - $(top_srcdir)/src/time.cc \ - $(top_srcdir)/test-suite/test_tools.cc \ - $(top_builddir)/src/globals.cc -testIcmp_LDFLAGS = $(LIBADD_DL) -testIcmp_LDADD=\ - $(SQUID_CPPUNIT_LIBS) \ - $(SQUID_CPPUNIT_LA) \ - libicmp-core.la \ - ../ip/libip.la \ - ../base/libbase.la \ - $(COMPAT_LIB) \ - $(XTRA_LIBS) -testIcmp_DEPENDENCIES= $(SQUID_CPPUNIT_LA) +## files we need to pull in from other locations +## copied like this to avoid subdir-objects collisions on 'make clean' +debug.cc: $(top_srcdir)/src/debug.cc + cp $(top_srcdir)/src/debug.cc . + +globals.cc: $(top_srcdir)/src/globals.h + cp $(top_builddir)/src/globals.cc . + +time.cc: $(top_srcdir)/src/time.cc + cp $(top_srcdir)/src/time.cc . + +SquidConfig.cc: $(top_srcdir)/src/SquidConfig.cc + cp $(top_srcdir)/src/SquidConfig.cc . + +SquidNew.cc: $(top_srcdir)/src/SquidNew.cc + cp $(top_srcdir)/src/SquidNew.cc . + +stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc + cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc . === modified file 'src/ip/Makefile.am' --- src/ip/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/ip/Makefile.am 2015-08-08 02:18:24 +0000 @@ -21,22 +21,3 @@ Qos.cci \ tools.cc \ tools.h - - -check_PROGRAMS += testIpAddress -TESTS += testIpAddress - -testIpAddress_SOURCES= \ - testAddress.cc \ - testAddress.h -nodist_testIpAddress_SOURCES= \ - $(top_srcdir)/src/tests/stub_debug.cc \ - $(top_srcdir)/src/tests/stub_tools.cc -testIpAddress_LDADD= \ - libip.la \ - ../base/libbase.la \ - $(XTRA_LIBS) \ - $(COMPAT_LIB) \ - $(SQUID_CPPUNIT_LA) \ - $(SQUID_CPPUNIT_LIBS) -testIpAddress_LDFLAGS= $(LIBADD_DL) === modified file 'src/ipc/Makefile.am' --- src/ipc/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/ipc/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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 = \ === modified file 'src/parser/Makefile.am' --- src/parser/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/parser/Makefile.am 2015-08-08 02:18:24 +0000 @@ -8,48 +8,9 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am -EXTRA_PROGRAMS = \ - testTokenizer - -check_PROGRAMS += testTokenizer -TESTS += testTokenizer - noinst_LTLIBRARIES = libsquid-parser.la libsquid_parser_la_SOURCES = \ Tokenizer.h \ Tokenizer.cc -SBUF_SOURCE= \ - $(top_srcdir)/src/base/CharacterSet.h \ - $(top_srcdir)/src/SBuf.h \ - $(top_srcdir)/src/SBuf.cc \ - $(top_srcdir)/src/MemBlob.h \ - $(top_srcdir)/src/MemBlob.cc \ - $(top_srcdir)/src/OutOfBoundsException.h \ - $(top_srcdir)/src/SBufExceptions.h \ - $(top_srcdir)/src/SBufExceptions.cc \ - $(top_srcdir)/src/String.cc \ - $(top_srcdir)/src/SquidString.h \ - $(top_srcdir)/src/base/TextException.h \ - $(top_srcdir)/src/base/TextException.cc - -testTokenizer_SOURCES = \ - $(SBUF_SOURCE) \ - testTokenizer.h \ - testTokenizer.cc \ - Tokenizer.h -nodist_testTokenizer_SOURCES = \ - $(top_srcdir)/src/tests/stub_mem.cc \ - $(top_srcdir)/src/tests/stub_debug.cc \ - $(top_srcdir)/src/tests/stub_time.cc \ - $(top_srcdir)/src/tests/stub_SBufDetailedStats.cc -testTokenizer_LDFLAGS = $(LIBADD_DL) -testTokenizer_LDADD = \ - libsquid-parser.la \ - $(top_builddir)/lib/libmiscutil.la \ - $(top_builddir)/src/base/libbase.la \ - $(SQUID_CPPUNIT_LIBS) \ - $(SQUID_CPPUNIT_LA) \ - $(COMPAT_LIB) -testTokenizer_DEPENDENCIES = $(SQUID_CPPUNIT_LA) === modified file 'src/repl/Makefile.am' --- src/repl/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/repl/Makefile.am 2015-08-08 02:18:24 +0000 @@ -10,8 +10,6 @@ ## 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 === modified file 'src/snmp/Makefile.am' --- src/snmp/Makefile.am 2015-01-13 09:13:49 +0000 +++ src/snmp/Makefile.am 2015-08-08 02:18:24 +0000 @@ -8,7 +8,6 @@ include $(top_srcdir)/src/Common.am include $(top_srcdir)/src/TestHeaders.am - noinst_LTLIBRARIES = libsnmp.la libsnmp_la_SOURCES = \ === renamed file 'src/ip/testAddress.cc' => 'src/tests/testAddress.cc' === renamed file 'src/ip/testAddress.h' => 'src/tests/testAddress.h' === renamed file 'src/base/testCharacterSet.cc' => 'src/tests/testCharacterSet.cc' === renamed file 'src/base/testCharacterSet.h' => 'src/tests/testCharacterSet.h' === renamed file 'src/icmp/testIcmp.cc' => 'src/tests/testIcmp.cc' --- src/icmp/testIcmp.cc 2015-01-13 09:13:49 +0000 +++ src/tests/testIcmp.cc 2015-08-08 02:18:24 +0000 @@ -9,19 +9,17 @@ #define SQUID_HELPER 1 #include "squid.h" +#include "tests/testIcmp.h" +#include "unitTestMain.h" #include -#include "testIcmp.h" -#include "unitTestMain.h" - CPPUNIT_TEST_SUITE_REGISTRATION( testIcmp ); -#if USE_ICMP - void testIcmp::testChecksum() { +#if USE_ICMP stubIcmp icmp; uint16_t buf[10], tmpval; for (tmpval=0; tmpval < 10; ++tmpval) @@ -70,11 +68,13 @@ CPPUNIT_ASSERT_EQUAL((int)htons(0xffc8), icmp.testChecksum(buf,20)); // 1+2...+10 // data with invalid length (overrun) ==> Garbage checksum... +#endif } void testIcmp::testHops() { +#if USE_ICMP stubIcmp icmp; /* test invalid -(under values) */ @@ -113,7 +113,6 @@ CPPUNIT_ASSERT_EQUAL(0, icmp.testHops(256)); // 257 - produces negative hops CPPUNIT_ASSERT_EQUAL(-1, icmp.testHops(257)); +#endif } -#endif /* USE_ICMP */ - === renamed file 'src/icmp/testIcmp.h' => 'src/tests/testIcmp.h' --- src/icmp/testIcmp.h 2015-01-13 09:13:49 +0000 +++ src/tests/testIcmp.h 2015-08-08 02:18:24 +0000 @@ -6,14 +6,15 @@ * Please see the COPYING and CONTRIBUTORS files for details. */ -#ifndef SQUID_SRC_TEST_URL_H -#define SQUID_SRC_TEST_URL_H +#ifndef SQUID_SRC_TESTS_TESTICMP_H +#define SQUID_SRC_TESTS_TESTICMP_H -#include "Icmp.h" #include #if USE_ICMP +#include "icmp/Icmp.h" + class stubIcmp : public Icmp { public: @@ -32,8 +33,7 @@ int testChecksum(unsigned short *ptr, int size) { return CheckSum(ptr,size); }; int testHops(int ttl) { return ipHops(ttl); }; }; - -#endif /* USE_ICMP */ +#endif /** * test the ICMP base class. @@ -41,18 +41,14 @@ class testIcmp : public CPPUNIT_NS::TestFixture { CPPUNIT_TEST_SUITE( testIcmp ); -#if USE_ICMP CPPUNIT_TEST( testChecksum ); CPPUNIT_TEST( testHops ); -#endif /* USE_ICMP */ CPPUNIT_TEST_SUITE_END(); protected: -#if USE_ICMP void testChecksum(); void testHops(); -#endif /* USE_ICMP */ }; -#endif +#endif /* SQUID_SRC_TESTS_TESTICMP_H */ === renamed file 'src/parser/testTokenizer.cc' => 'src/tests/testTokenizer.cc' --- src/parser/testTokenizer.cc 2015-01-13 09:13:49 +0000 +++ src/tests/testTokenizer.cc 2015-08-08 02:18:24 +0000 @@ -9,7 +9,7 @@ #include "squid.h" #include "base/CharacterSet.h" #include "parser/Tokenizer.h" -#include "testTokenizer.h" +#include "tests/testTokenizer.h" #include "unitTestMain.h" CPPUNIT_TEST_SUITE_REGISTRATION( testTokenizer ); === renamed file 'src/parser/testTokenizer.h' => 'src/tests/testTokenizer.h' === modified file 'test-suite/Makefile.am' --- test-suite/Makefile.am 2015-01-13 09:13:49 +0000 +++ test-suite/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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) === modified file 'tools/Makefile.am' --- tools/Makefile.am 2015-01-13 09:13:49 +0000 +++ tools/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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 = purge squidclient systemd sysvinit -EXTRA_DIST = -man_MANS = -DISTCLEANFILES = +EXTRA_DIST = +man_MANS = +DISTCLEANFILES = -LDADD = \ +LDADD= \ $(top_builddir)/src/ip/libip.la \ $(top_builddir)/lib/libmiscencoding.la \ $(top_builddir)/lib/libmiscutil.la \ === modified file 'tools/squidclient/Makefile.am' --- tools/squidclient/Makefile.am 2015-01-13 09:13:49 +0000 +++ tools/squidclient/Makefile.am 2015-08-08 02:18:24 +0000 @@ -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 \ === modified file 'tools/systemd/Makefile.am' --- tools/systemd/Makefile.am 2015-01-13 09:13:49 +0000 +++ tools/systemd/Makefile.am 2015-08-08 02:18:24 +0000 @@ -5,6 +5,4 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AUTOMAKE_OPTIONS = subdir-objects - EXTRA_DIST = squid.service === modified file 'tools/sysvinit/Makefile.am' --- tools/sysvinit/Makefile.am 2015-01-13 09:13:49 +0000 +++ tools/sysvinit/Makefile.am 2015-08-08 02:18:24 +0000 @@ -5,6 +5,4 @@ ## Please see the COPYING and CONTRIBUTORS files for details. ## -AUTOMAKE_OPTIONS = subdir-objects - EXTRA_DIST = squid.rc