Merged from trunk

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

diff --git a/src/Makefile.am b/src/Makefile.am
index 2472d4581ec1e8c84180c45aa6632eb8d1930a0a..015839a02477cd544a67913a8536634f54818cdb 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -412,6 +412,8 @@ libsquid_la_SOURCES = \
        comm.h \
        CommCalls.cc \
        CommCalls.h \
+       DescriptorSet.cc \
+       DescriptorSet.h \
        IPInterception.cc \
        IPInterception.h \
         ICAP/AsyncJob.cc \
@@ -705,8 +707,7 @@ squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @DISK_LINKOBJS@ \
        @REPL_OBJS@ \
        @AUTH_LINKOBJS@ \
-       @AUTH_OBJS@ \
-       ${ADAPTATION_LIBS}
+       @AUTH_OBJS@
 
 if USE_LOADABLE_MODULES
 squid_SOURCES += $(LOADABLE_MODULES_SOURCES)
@@ -925,8 +926,7 @@ ufsdump_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a \
        @DISK_LINKOBJS@ \
        @REPL_OBJS@ \
        @AUTH_LINKOBJS@ \
-       @AUTH_OBJS@ \
-       ${ADAPTATION_LIBS}
+       @AUTH_OBJS@
 
 nodist_ufsdump_SOURCES = \
        repl_modules.cc \
@@ -1460,8 +1460,7 @@ tests_testCacheManager_LDADD = \
 tests_testCacheManager_LDFLAGS = $(LIBADD_DL)
 tests_testCacheManager_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@ \
-       ${ADAPTATION_LIBS}
+       @SQUID_CPPUNIT_LA@
 
 tests_testDiskIO_SOURCES= \
        $(SWAP_TEST_SOURCES) \
@@ -1632,8 +1631,7 @@ tests_testEvent_LDADD = \
 tests_testEvent_LDFLAGS = $(LIBADD_DL)
 tests_testEvent_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@ \
-       ${ADAPTATION_LIBS}
+       @SQUID_CPPUNIT_LA@
 
 ## Tests of the EventLoop module.
 tests_testEventLoop_SOURCES = \
@@ -1788,8 +1786,7 @@ tests_testEventLoop_LDADD = \
 tests_testEventLoop_LDFLAGS = $(LIBADD_DL)
 tests_testEventLoop_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@ \
-       ${ADAPTATION_LIBS}
+       @SQUID_CPPUNIT_LA@
 
 tests_test_http_range_SOURCES = \
        tests/test_http_range.cc \
@@ -2095,8 +2092,7 @@ tests_testHttpRequest_LDADD = \
 tests_testHttpRequest_LDFLAGS = $(LIBADD_DL)
 tests_testHttpRequest_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@ \
-       ${ADAPTATION_LIBS}
+       @SQUID_CPPUNIT_LA@
 
 # TODO:mime.cc drags in HttpReply.cc
 # delay pools need client_side_request.cc
@@ -2439,5 +2435,4 @@ tests_testURL_LDADD = \
 tests_testURL_LDFLAGS = $(LIBADD_DL)
 tests_testURL_DEPENDENCIES =  $(top_builddir)/lib/libmiscutil.a \
        @REPL_OBJS@ \
-       @SQUID_CPPUNIT_LA@ \
-       ${ADAPTATION_LIBS}
+       @SQUID_CPPUNIT_LA@