Fix SBuf and SBufList unit tests linkage

diff --git a/src/Makefile.am b/src/Makefile.am
index ced6ff07d74c81b5f899646495e4ab81da7ab3b6..00c1ee6b81499254328c13201f95151ec2d3fe36 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -3703,15 +3703,15 @@ tests_testSBuf_SOURCES= \
 nodist_tests_testSBuf_SOURCES=$(TESTSOURCES)
 tests_testSBuf_LDFLAGS = $(LIBADD_DL)
 tests_testSBuf_LDADD=\
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
-       $(COMPAT_LIB) \
+       base/libbase.la \
        libsquid.la \
        ip/libip.la \
        mgr/libmgr.la \
-       base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
-       $(COMMON_LIBS)
+       $(REGEXLIB) \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 tests_testSBuf_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 tests_testSBufList_SOURCES= \
@@ -3719,40 +3719,44 @@ tests_testSBufList_SOURCES= \
        tests/testSBufList.cc \
        tests/testMain.cc \
        $(SBUF_SOURCE) \
-  SBufList.h \
-  SBufList.cc \
-  SBufAlgos.h \
+       SBufList.h \
+       SBufList.cc \
+       SBufAlgos.h \
        SBufDetailedStats.h \
        tests/stub_SBufDetailedStats.cc \
        SBufStream.h \
        tests/stub_time.cc \
        mem.cc \
        tests/stub_MemObject.cc \
+       tests/stub_cbdata.cc \
+       tests/stub_comm.cc \
        tests/stub_debug.cc \
        tests/stub_event.cc \
        tests/stub_fatal.cc \
+       tests/stub_fd.cc \
        tests/stub_HelperChildConfig.cc \
        tests/stub_cache_cf.cc \
        tests/stub_cache_manager.cc \
        tests/stub_store.cc \
+       tests/stub_stmem.cc \
        tests/stub_store_stats.cc \
        tests/stub_tools.cc \
        SquidString.h \
+       StatCounters.cc \
        String.cc \
        tests/stub_wordlist.cc \
        tests/stub_MemBuf.cc
 nodist_tests_testSBufList_SOURCES=$(TESTSOURCES)
 tests_testSBufList_LDFLAGS = $(LIBADD_DL)
 tests_testSBufList_LDADD=\
-       $(SQUID_CPPUNIT_LIBS) \
-       $(SQUID_CPPUNIT_LA) \
-       $(COMPAT_LIB) \
+       base/libbase.la \
        libsquid.la \
        ip/libip.la \
        mgr/libmgr.la \
-       base/libbase.la \
        $(top_builddir)/lib/libmiscutil.la \
-       $(COMMON_LIBS)
+       $(SQUID_CPPUNIT_LIBS) \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 tests_testSBufList_DEPENDENCIES= $(SQUID_CPPUNIT_LA)
 
 tests_testConfigParser_SOURCES = \