Make src/ip/ objects build.

diff --git a/configure.in b/configure.in
index 581738559116634ba251bb35a552211822ba84ae..8fbb001e6a15285330dd80fb7cdd6b5976bb087a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3820,6 +3820,7 @@ AC_CONFIG_FILES([\
        src/adaptation/Makefile \
        src/ICAP/Makefile \
        src/icmp/Makefile \
+       src/ip/Makefile \
        src/eCAP/Makefile \
        contrib/Makefile \
        snmplib/Makefile \

diff --git a/src/Makefile.am b/src/Makefile.am
index 196e57c335fac7adbab8d3500655f815ace1f17a..85423cd556f3421eb30cc36db8065a880b3c9ee3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -34,7 +34,7 @@ LOADABLE_MODULES_SOURCES = \
 TESTS=$(check_PROGRAMS)
 check_PROGRAMS=
 
-SUBDIRS                = fs repl auth icmp
+SUBDIRS                = fs repl auth icmp ip
 
 if USE_ADAPTATION
 SUBDIRS += adaptation
@@ -247,7 +247,7 @@ cf_gen_SOURCES = \
        cf_gen.cc \
        defines.h \
        debug.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        time.cc
 
 nodist_cf_gen_SOURCES = globals.cc
@@ -589,8 +589,6 @@ squid_SOURCES = \
        PeerSelectState.h \
        PingData.h \
        protos.h \
-       QosConfig.cc \
-       QosConfig.h \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -691,6 +689,7 @@ squid_LDADD = \
        libsquid.la \
        libauth.la \
        icmp/libicmp.la icmp/libicmp-core.la \
+       ip/libip.la \
        -L../lib \
        @XTRA_OBJS@ \
        @DISK_LINKOBJS@ \
@@ -871,7 +870,7 @@ ufsdump_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.cc \
        protos.h \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -1218,7 +1217,7 @@ tests_testAuth_SOURCES = \
        tests/stub_store.cc HttpHeaderTools.cc HttpHeader.cc acl.cc mem.cc \
        MemBuf.cc HttpHdrContRange.cc Packer.cc ACLChecklist.cc HttpHdrCc.cc HttpHdrSc.cc \
        HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
        tests/stub_HttpRequest.cc tests/stub_DelayId.cc \
        tests/stub_MemObject.cc mem_node.cc \
@@ -1295,7 +1294,7 @@ tests_testACLMaxUserIP_SOURCES= \
        mem_node.cc \
        Packer.cc \
        Parsing.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        StatHist.cc \
        stmem.cc \
        String.cc \
@@ -1432,7 +1431,7 @@ tests_testCacheManager_SOURCES = \
        peer_select.cc \
        peer_sourcehash.cc \
        peer_userhash.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -1504,7 +1503,7 @@ tests_testDiskIO_SOURCES = \
        tests/testDiskIO.h \
        tests/testMain.cc \
        tests/stub_cache_manager.cc \
-       stubQosConfig.cc
+       ip/stubQosConfig.cc
 nodist_tests_testDiskIO_SOURCES= \
        $(SWAP_TEST_GEN_SOURCES)
 tests_testDiskIO_LDADD = \
@@ -1610,7 +1609,7 @@ tests_testEvent_SOURCES = \
        peer_select.cc \
        peer_sourcehash.cc \
        peer_userhash.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -1767,7 +1766,7 @@ tests_testEventLoop_SOURCES = \
        peer_select.cc \
        peer_sourcehash.cc \
        peer_userhash.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -1914,7 +1913,7 @@ tests_test_http_range_SOURCES = \
        peer_sourcehash.cc \
        peer_userhash.cc \
        pconn.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -2076,7 +2075,7 @@ tests_testHttpRequest_SOURCES = \
        peer_select.cc \
        peer_sourcehash.cc \
        peer_userhash.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \
@@ -2175,7 +2174,7 @@ STORE_TEST_SOURCES=\
        HttpHdrScTarget.cc url.cc ACLProxyAuth.cc ACLRegexData.cc ACLUserData.cc \
        StatHist.cc HttpHdrRange.cc ETag.cc tests/stub_errorpage.cc \
        tests/stub_HttpRequest.cc tests/stub_access_log.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        refresh.cc \
        tests/stub_store_client.cc \
        tests/stub_tools.cc \
@@ -2229,7 +2228,7 @@ tests_testStore_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
 # libsquid pulls in SquidConfig and children. stub them.
 tests_testString_SOURCES = \
        mem.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        String.cc \
        tests/testMain.cc \
        tests/testString.cc \
@@ -2442,7 +2441,7 @@ tests_testURL_SOURCES = \
        peer_select.cc \
        peer_sourcehash.cc \
        peer_userhash.cc \
-       stubQosConfig.cc \
+       ip/stubQosConfig.cc \
        redirect.cc \
        referer.cc \
        refresh.cc \

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
new file mode 100644 (file)
index 0000000..1ac2440
--- /dev/null
+++ b/src/ip/Makefile.am
@@ -0,0 +1,39 @@
+#
+#  Makefile for the Squid IP layer API
+#
+
+# Housekeeping, shared by all Squid Makefiles.
+# TODO: make this set by configure?
+AM_CFLAGS = @SQUID_CFLAGS@
+AM_CXXFLAGS = @SQUID_CXXFLAGS@
+DEFS = @DEFS@
+CLEANFILES = 
+
+INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
+$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
+
+
+# IP Specific Configurations
+
+#EXTRA_PROGRAMS = \
+#      testIcmp
+
+noinst_LTLIBRARIES = libip.la
+
+libip_la_SOURCES = \
+       QosConfig.h \
+       QosConfig.cc
+
+
+check_PROGRAMS= testHeaders
+TESTS= $(check_PROGRAMS)
+
+## Special Universal .h dependency test script
+## aborts if error encountered
+testHeaders: $(top_srcdir)/src/icmp/*.h
+       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/icmp/" || exit 1
+
+## No such file...
+testHeaders.c:
+       touch testHeaders.c
+CLEANFILES += testHeaders.c