Maintenance: Remove shared LDADD (#2058)

Most built binaries have a distinct set of dependencies and already have
their own foo_LDADD variables. Add a few variables to cover the
remaining binaries and stop setting an (incomplete) LDADD global.

Also removed unnecessary EXTRA_PROGRAMS because mem_node_test and splay
binaries are built unconditionally.

diff --git a/src/Makefile.am b/src/Makefile.am
index 609572f26c6cebf3ec6aceb33a32e5e05605a583..5d061019454bcdb4a559d5b39f6998262de12943 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -580,24 +580,6 @@ sysconf_DATA = \
 data_DATA = \
        mib.txt
 
-LDADD = \
-       $(AUTH_ACL_LIBS) \
-       acl/libacls.la \
-       eui/libeui.la \
-       acl/libstate.la \
-       $(AUTH_LIBS) \
-       acl/libapi.la \
-       base/libbase.la \
-       libsquid.la \
-       ip/libip.la \
-       fs/libfs.la \
-       ipc/libipc.la \
-       mgr/libmgr.la \
-       $(EPOLL_LIBS) \
-       $(MINGW_LIBS) \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-
 include $(srcdir)/tests/Stub.am
 
 EXTRA_DIST = \

diff --git a/test-suite/Makefile.am b/test-suite/Makefile.am
index d37bb7a71a42e6f2b66316815cedbd72868d26d3..0da58443e9c7c263cb8b9324dcad9625ab23000f 100644 (file)
--- a/test-suite/Makefile.am
+++ b/test-suite/Makefile.am
@@ -10,16 +10,6 @@ include $(top_srcdir)/src/Common.am
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 
-LDADD = \
-       $(top_builddir)/src/base/libbase.la \
-       $(top_builddir)/src/globals.o \
-       $(top_builddir)/src/time/libtime.la \
-       $(top_builddir)/lib/libmiscutil.la \
-       $(COMPAT_LIB) \
-       $(XTRA_LIBS)
-
-EXTRA_PROGRAMS = mem_node_test splay
-
 EXTRA_DIST = \
        $(srcdir)/squidconf/* \
        test-functionality.sh \
@@ -51,6 +41,7 @@ STUBS = \
        stub_SBuf.cc \
        stub_tools.cc \
        stub_fatal.cc \
+       stub_libtime.cc \
        STUB.h
 DEBUG_SOURCE = test_tools.cc $(STUBS)
 CLEANFILES += $(STUBS) stub_libmem.cc
@@ -73,6 +64,9 @@ stub_fatal.cc: $(top_srcdir)/src/tests/stub_fatal.cc
 stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
        cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
+stub_libtime.cc: $(top_srcdir)/src/tests/stub_libtime.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_libtime.cc $@
+
 STUB.h: $(top_srcdir)/src/tests/STUB.h
        cp $(top_srcdir)/src/tests/STUB.h $@
 
@@ -84,7 +78,10 @@ mem_node_test_LDADD = \
        $(top_builddir)/src/mem/libmem.la \
        $(top_builddir)/src/debug/libdebug.la \
        $(top_builddir)/src/comm/libminimal.la \
-       $(LDADD)
+       $(top_builddir)/src/base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 mem_hdr_test_SOURCES = \
        $(DEBUG_SOURCE) \
@@ -95,22 +92,35 @@ mem_hdr_test_LDADD = \
        $(top_builddir)/src/mem/libmem.la \
        $(top_builddir)/src/debug/libdebug.la \
        $(top_builddir)/src/comm/libminimal.la \
-       $(LDADD)
+       $(top_builddir)/src/base/libbase.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 splay_SOURCES = \
        $(DEBUG_SOURCE) \
        splay.cc \
        stub_libmem.cc
+splay_LDADD = \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 syntheticoperators_SOURCES = \
        $(DEBUG_SOURCE) \
        stub_libmem.cc \
        syntheticoperators.cc
+syntheticoperators_LDADD = \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 VirtualDeleteOperator_SOURCES = \
        $(DEBUG_SOURCE) \
        VirtualDeleteOperator.cc \
        stub_libmem.cc
+VirtualDeleteOperator_LDADD = \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 installcheck-local: squid-conf-tests