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

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 85a34dcd833a4b23b11f64d9c9c1886b678e6ec5..2622b80454d36956eeec3c2b9b43071336e2ff50 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 ac6bb10034c050c6e40789547e3c93300a927875..0db2fb9401a768f28fd2c730c24a541ec4e1d878 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 9d99848edc91cc61d6661a0cfc15118b7d1e5c0f..9dbed80a4e937c5f238a0f7785f0c80fdc2c6905 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 793eeb3034b874ebfeecfacbf4d9fd8b048372a6..b747b6c78f11a6525cad265e2484768a657e9f75 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 \
        SquidDns.h \
@@ -1069,13 +1067,17 @@ TESTSOURCES= \
 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_LDFLAGS = $(LIBADD_DL)
 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_LDFLAGS = $(LIBADD_DL)
 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 @@ tests_testHttpRequest_DEPENDENCIES = \
        $(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= \

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index e57bd6c36b689950cc81bc71bb44b332c9566f35..3d5373cc3cb0dca7875967bc1bb946339f6a38ee 100644 (file)
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -21,7 +21,6 @@ libbase_la_SOURCES = \
        AsyncCallQueue.h \
        CharacterSet.h \
        CharacterSet.cc \
-       TidyPointer.h \
        CbcPointer.h \
        InstanceId.h \
        Lock.h \
@@ -30,27 +29,5 @@ libbase_la_SOURCES = \
        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

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/icmp/Makefile.am b/src/icmp/Makefile.am
index 5295be180a1a332cd545c3e122da5deb8d51078f..f8bc00e66b9cdb547fe22af288200acb31040e67 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -9,40 +9,20 @@ include $(top_srcdir)/src/Common.am
 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 @@ libicmp_la_SOURCES = \
        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 @@ pinger_SOURCES = \
        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 @@ pinger_LDADD=\
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 
+CLEANFILES += $(COPIED_SOURCE)
 
 ##install-pinger:
 ##     @f=$(PINGER_EXE); \
@@ -98,29 +78,22 @@ pinger_LDADD=\
 ##             $(RM) -f $(libexecdir)/-$$f; \
 ##     fi
 
+## 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 .
 
-check_PROGRAMS += testIcmp
-TESTS += testIcmp
+globals.cc: $(top_srcdir)/src/globals.h
+       cp $(top_builddir)/src/globals.cc .
 
-## 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)
+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 .

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 4321f480550148b9b8043eac9991b7b627b9d5eb..b741b12b6b48e01b5c3e1c781d566bb710a11cab 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -21,22 +21,3 @@ libip_la_SOURCES = \
        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)

diff --git a/src/ipc/Makefile.am b/src/ipc/Makefile.am
index ec648e4d6013c564fcdc50b3b83ae44cf1ed4075..6bd1602a5fce6733dea4887507ac43a26c73cd87 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/parser/Makefile.am b/src/parser/Makefile.am
index 4a276f0838cc0d99bf5a2666adc281600c0f1438..dd57ce5e35f21d313f5d57f3615acc6c3ef0fafc 100644 (file)
--- a/src/parser/Makefile.am
+++ b/src/parser/Makefile.am
@@ -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)

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/src/ip/testAddress.cc b/src/tests/testAddress.cc
similarity index 100%
rename from src/ip/testAddress.cc
rename to src/tests/testAddress.cc

diff --git a/src/ip/testAddress.h b/src/tests/testAddress.h
similarity index 100%
rename from src/ip/testAddress.h
rename to src/tests/testAddress.h

diff --git a/src/base/testCharacterSet.cc b/src/tests/testCharacterSet.cc
similarity index 100%
rename from src/base/testCharacterSet.cc
rename to src/tests/testCharacterSet.cc

diff --git a/src/base/testCharacterSet.h b/src/tests/testCharacterSet.h
similarity index 100%
rename from src/base/testCharacterSet.h
rename to src/tests/testCharacterSet.h

diff --git a/src/icmp/testIcmp.cc b/src/tests/testIcmp.cc
similarity index 98%
rename from src/icmp/testIcmp.cc
rename to src/tests/testIcmp.cc
index 7f4ed627c28d753c5c34fd6d9070e55062febfa6..43eac7612eb92d2ef7cd4b12510e404bfbeea84e 100644 (file)
--- a/src/icmp/testIcmp.cc
+++ b/src/tests/testIcmp.cc
@@ -9,19 +9,17 @@
 #define SQUID_HELPER 1
 
 #include "squid.h"
+#include "tests/testIcmp.h"
+#include "unitTestMain.h"
 
 #include <cppunit/TestAssert.h>
 
-#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 @@ testIcmp::testChecksum()
     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 @@ testIcmp::testHops()
     CPPUNIT_ASSERT_EQUAL(0, icmp.testHops(256));
     // 257 - produces negative hops
     CPPUNIT_ASSERT_EQUAL(-1, icmp.testHops(257));
+#endif
 }
 
-#endif /* USE_ICMP */
-

diff --git a/src/icmp/testIcmp.h b/src/tests/testIcmp.h
similarity index 87%
rename from src/icmp/testIcmp.h
rename to src/tests/testIcmp.h
index 3904a23b7b105caa8c0b3204b963ff002750ff0f..f935a27179b1b20f4088de2ebba74e0b14ab9f2b 100644 (file)
--- a/src/icmp/testIcmp.h
+++ b/src/tests/testIcmp.h
@@ -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 <cppunit/extensions/HelperMacros.h>
 
 #if USE_ICMP
 
+#include "icmp/Icmp.h"
+
 class stubIcmp : public Icmp
 {
 public:
@@ -32,8 +33,7 @@ public:
     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 @@ public:
 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 */
 

diff --git a/src/parser/testTokenizer.cc b/src/tests/testTokenizer.cc
similarity index 99%
rename from src/parser/testTokenizer.cc
rename to src/tests/testTokenizer.cc
index d0a96bf77e330a542601073edc322d2fe1f92464..682f0d01f89c6261659c6ed8eb84eb67019377ba 100644 (file)
--- a/src/parser/testTokenizer.cc
+++ b/src/tests/testTokenizer.cc
@@ -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 );

diff --git a/src/parser/testTokenizer.h b/src/tests/testTokenizer.h
similarity index 100%
rename from src/parser/testTokenizer.h
rename to src/tests/testTokenizer.h

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index b9c412d78f1c2cff4da467cfacaa716647fcdce2..e479f17f441fc830f75d21ed4dffbf03238fe080 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 1485bc9902977f2228e8d4c35e8073cc55eea828..f1b7306504eadb8aceb867d00022a7f2c3034e46 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 = 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 \

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