Skip to content

Maintenance: Remove shared LDADD #2058

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
yadij wants to merge 4 commits into from
Closed

Maintenance: Remove shared LDADD #2058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77899ab
Remove last uses of global LDADD
yadij May 3, 2025
d924d49
Merge branch 'master' into rm-LDADD
yadij May 6, 2025
5fb3efe
Merge branch 'master' into rm-LDADD
kinkie May 11, 2025
c8492a0
Merge branch 'master' into rm-LDADD
yadij May 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions src/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand Down
34 changes: 22 additions & 12 deletions test-suite/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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
Expand All @@ -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 $@

Expand All @@ -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) \
Expand All @@ -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

Expand Down