]> git.ipfire.org Git - thirdparty/squid.git/commitdiff
Removed $ADAPTATION_LIBS from dependencies because it includes -lecap, which
authorAlex Rousskov <rousskov@measurement-factory.com>
Thu, 8 May 2008 20:07:26 +0000 (14:07 -0600)
committerAlex Rousskov <rousskov@measurement-factory.com>
Thu, 8 May 2008 20:07:26 +0000 (14:07 -0600)
is not a dependency.
TODO: add $ADAPTATION_DEPS or similar.

src/Makefile.am

index 8594a12d980dbc6816662439a423083b14258717..c737da8846e34826d297c9635b7c4f4b5bb3683b 100644 (file)
@@ -719,8 +719,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)
@@ -954,8 +953,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 \
@@ -1496,8 +1494,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) \
@@ -1666,8 +1663,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 = \
@@ -1822,8 +1818,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 \
@@ -2129,8 +2124,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@
 
 ## Tests of the ICMP base module.
 # Its used by pinger so SHOULD NOT require more dependancies! :-(
@@ -2487,5 +2481,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@