Merged from trunk rev.14096

[thirdparty/squid.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 6619f467780c85597e4795e8141d59102feb5272..ecc95486a9fb86c4e04cef6bfd1adad60d4b7fe7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,10 +10,7 @@ include $(top_srcdir)/src/Common.am
 AUTOMAKE_OPTIONS = subdir-objects
 
 DNSSOURCE = \
-       dns_internal.cc \
-       SquidDns.h \
-       DnsLookupDetails.h \
-       DnsLookupDetails.cc
+       dns_internal.cc
 
 SBUF_SOURCE= \
        base/CharacterSet.h \
@@ -47,8 +44,8 @@ LOADABLE_MODULES_SOURCES = \
        LoadableModules.h \
        LoadableModules.cc
 
-SUBDIRS        = mem base anyp helper ftp parser comm eui acl format clients servers fs repl
-DIST_SUBDIRS = mem base anyp helper ftp parser comm eui acl format clients servers fs repl
+SUBDIRS        = mem base anyp helper dns ftp parser comm eui acl format clients servers fs repl
+DIST_SUBDIRS = mem base anyp helper dns ftp parser comm eui acl format clients servers fs repl
 
 if ENABLE_AUTH
 SUBDIRS += auth
@@ -58,16 +55,15 @@ check_PROGRAMS+= tests/testACLMaxUserIP
 endif
 DIST_SUBDIRS += auth
 
-SUBDIRS        += http ip icmp ident log ipc mgr
-DIST_SUBDIRS += http ip icmp ident log ipc mgr
+SUBDIRS        += http ip icmp ident log ipc mgr security
+DIST_SUBDIRS += http ip icmp ident log ipc mgr security
 
+SSL_LIBS=
 if ENABLE_SSL
 SUBDIRS += ssl
-SSL_LIBS = \
+SSL_LIBS += \
        ssl/libsslsquid.la \
        ssl/libsslutil.la
-else
-SSL_LOCAL_LIBS =
 endif
 DIST_SUBDIRS += ssl
 
@@ -288,15 +284,13 @@ squid_SOURCES = \
        CacheDigest.cc \
        cache_manager.cc \
        NeighborTypeDomainList.h \
-       CachePeerDomainList.h \
+       CachePeer.cc \
        CachePeer.h \
        CacheManager.h \
        carp.h \
        carp.cc \
        cbdata.cc \
        cbdata.h \
-       ChunkedCodingParser.cc \
-       ChunkedCodingParser.h \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -444,8 +438,6 @@ squid_SOURCES = \
        neighbors.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
-       Packer.h \
        Parsing.cc \
        Parsing.h \
        $(XPROF_STATS_SOURCE) \
@@ -614,6 +606,8 @@ squid_LDADD = \
        helper/libhelper.la \
        http/libsquid-http.la \
        parser/libsquid-parser.la \
+       dns/libdns.la \
+       security/libsecurity.la \
        base/libbase.la \
        libsquid.la \
        ip/libip.la \
@@ -1059,6 +1053,7 @@ check_PROGRAMS+=\
        tests/testBoilerplate \
        tests/testCacheManager \
        tests/testDiskIO \
+       tests/testDns \
        tests/testEvent \
        tests/testEventLoop \
        tests/test_http_range \
@@ -1147,8 +1142,6 @@ tests_testHttpReply_SOURCES=\
        mime_header.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
-       Packer.h \
        SquidString.h \
        SquidTime.h \
        $(SBUF_SOURCE) \
@@ -1254,7 +1247,6 @@ tests_testACLMaxUserIP_SOURCES= \
        SquidList.h \
        SquidList.cc \
        mem_node.cc \
-       Packer.cc \
        Parsing.cc \
        SquidMath.cc \
        StatCounters.cc \
@@ -1401,12 +1393,13 @@ tests_testCacheManager_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -1477,6 +1470,7 @@ tests_testCacheManager_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -1494,7 +1488,6 @@ tests_testCacheManager_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -1586,6 +1579,7 @@ tests_testCacheManager_LDADD = \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
        fs/libfs.la \
@@ -1673,7 +1667,6 @@ tests_testDiskIO_SOURCES = \
        mem_node.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        refresh.h \
        refresh.cc \
@@ -1768,7 +1761,6 @@ tests_testDiskIO_LDADD = \
        parser/libsquid-parser.la \
        SquidConfig.o \
        CommCalls.o \
-       DnsLookupDetails.o \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@ -1784,6 +1776,7 @@ tests_testDiskIO_LDADD = \
        mgr/libmgr.la \
        $(SSL_LIBS) \
        ipc/libipc.la \
+       dns/libdns.la \
        base/libbase.la \
        mem/libmem.la \
        $(top_builddir)/lib/libmisccontainers.la \
@@ -1802,7 +1795,23 @@ tests_testDiskIO_DEPENDENCIES = \
        $(SWAP_TEST_DS) \
        $(SQUID_CPPUNIT_LA)
 
-## Tests of the Even module.
+tests_testDns_SOURCES= \
+       tests/testRFC1035.cc \
+       tests/testRFC1035.h
+nodist_tests_testDns_SOURCES= \
+       tests/stub_debug.cc \
+       tests/stub_SBuf.cc \
+       tests/stub_tools.cc
+tests_testDns_LDADD= \
+       dns/libdns.la \
+       base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       $(SQUID_CPPUNIT_LIBS)
+tests_testDns_LDFLAGS= $(LIBADD_DL)
+
 tests_testEvent_SOURCES = \
        AccessLogEntry.cc \
        BodyPipe.cc \
@@ -1814,11 +1823,12 @@ tests_testEvent_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        cache_manager.cc \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -1897,6 +1907,7 @@ tests_testEvent_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -1915,7 +1926,6 @@ tests_testEvent_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -2012,6 +2022,7 @@ tests_testEvent_LDADD = \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
        fs/libfs.la \
@@ -2058,10 +2069,11 @@ tests_testEventLoop_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -2140,6 +2152,7 @@ tests_testEventLoop_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2158,7 +2171,6 @@ tests_testEventLoop_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -2254,6 +2266,7 @@ tests_testEventLoop_LDADD = \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
        fs/libfs.la \
@@ -2296,13 +2309,14 @@ tests_test_http_range_SOURCES = \
        YesNoNone.cc \
        RefreshPattern.h \
        cache_cf.cc \
+       CachePeer.cc \
+       CachePeer.h \
        cache_manager.cc \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -2378,6 +2392,7 @@ tests_test_http_range_SOURCES = \
        internal.cc \
        $(IPC_SOURCE) \
        ipcache.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2396,7 +2411,6 @@ tests_test_http_range_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        peer_digest.cc \
        peer_proxy_negotiate_auth.h \
@@ -2506,6 +2520,7 @@ tests_test_http_range_LDADD = \
        $(ESI_LIBS) \
        $(SSL_LIBS) \
        ipc/libipc.la \
+       dns/libdns.la \
        base/libbase.la \
        mgr/libmgr.la \
        $(SNMP_LIBS) \
@@ -2602,10 +2617,11 @@ tests_testHttpRequest_SOURCES = \
        debug.cc \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
+       CachePeer.cc \
+       CachePeer.h \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -2671,6 +2687,7 @@ tests_testHttpRequest_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -2688,7 +2705,6 @@ tests_testHttpRequest_SOURCES = \
        neighbors.cc \
        Notes.cc \
        Notes.h \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -2782,6 +2798,7 @@ tests_testHttpRequest_LDADD = \
        $(SSL_LIBS) \
        ipc/libipc.la \
        parser/libsquid-parser.la \
+       dns/libdns.la \
        base/libbase.la \
        mgr/libmgr.la \
        anyp/libanyp.la \
@@ -2859,7 +2876,6 @@ tests_testStore_SOURCES= \
        MemObject.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
        refresh.h \
@@ -2960,6 +2976,7 @@ tests_testStore_LDADD= \
        acl/libacls.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
        fs/libfs.la \
@@ -2975,7 +2992,6 @@ tests_testStore_LDADD= \
        $(SQUID_CPPUNIT_LIBS) \
        $(SSLLIB) \
        CommCalls.o \
-       DnsLookupDetails.o \
        $(COMPAT_LIB) \
        $(XTRA_LIBS)
 tests_testStore_LDFLAGS = $(LIBADD_DL)
@@ -2999,6 +3015,7 @@ tests_testString_SOURCES = \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_cbdata.cc \
        tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        tools.h \
@@ -3140,7 +3157,6 @@ tests_testUfs_SOURCES = \
        ClientInfo.h \
        MemBuf.cc \
        HttpHdrContRange.cc \
-       Packer.cc \
        HttpHeaderFieldStat.h \
        HttpHdrCc.h \
        HttpHdrCc.cc \
@@ -3182,7 +3198,6 @@ tests_testUfs_LDADD = \
        http/libsquid-http.la \
        parser/libsquid-parser.la \
        CommCalls.o \
-       DnsLookupDetails.o \
        ident/libident.la \
        acl/libacls.la \
        acl/libstate.la \
@@ -3200,6 +3215,7 @@ tests_testUfs_LDADD = \
        ipc/libipc.la \
        comm/libcomm.la \
        anyp/libanyp.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
        mem/libmem.la \
@@ -3277,7 +3293,6 @@ tests_testRock_SOURCES = \
        mem_node.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        RemovalPolicy.cc \
        RequestFlags.cc \
@@ -3408,10 +3423,11 @@ tests_testURL_SOURCES = \
        tests/stub_cache_manager.cc \
        CacheDigest.h \
        tests/stub_CacheDigest.cc \
+       CachePeer.cc \
+       CachePeer.h \
        carp.h \
        tests/stub_carp.cc \
        cbdata.cc \
-       ChunkedCodingParser.cc \
        client_db.h \
        client_db.cc \
        client_side.h \
@@ -3487,6 +3503,7 @@ tests_testURL_SOURCES = \
        int.cc \
        internal.h \
        internal.cc \
+       tests/stub_libsecurity.cc \
        SquidList.h \
        SquidList.cc \
        MasterXaction.cc \
@@ -3505,7 +3522,6 @@ tests_testURL_SOURCES = \
        neighbors.cc \
        Notes.h \
        Notes.cc \
-       Packer.cc \
        Parsing.cc \
        pconn.cc \
        peer_digest.cc \
@@ -3606,6 +3622,7 @@ tests_testURL_LDADD = \
        eui/libeui.la \
        acl/libstate.la \
        acl/libapi.la \
+       dns/libdns.la \
        base/libbase.la \
        ip/libip.la \
        fs/libfs.la \
@@ -3654,6 +3671,7 @@ tests_testSBuf_SOURCES= \
        tests/stub_libmem.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_cbdata.cc \
        tests/stub_store.cc \
        tests/stub_store_stats.cc \
        tests/stub_tools.cc \
@@ -3737,6 +3755,7 @@ tests_testConfigParser_SOURCES = \
        YesNoNone.h \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
+       tests/stub_cbdata.cc \
        tests/stub_debug.cc \
        tests/stub_HelperChildConfig.cc \
        tools.h \