-## Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2023 The Squid Software Foundation and contributors
##
## Squid software is distributed under GPLv2+ license and includes
## contributions from numerous individuals and organizations.
LDADD= \
$(top_builddir)/src/ip/libip.la \
+ $(top_builddir)/src/mem/libminimal.la \
+ $(top_builddir)/src/time/libtime.la \
$(top_builddir)/lib/libmiscencoding.la \
$(top_builddir)/lib/libmiscutil.la \
$(COMPAT_LIB) \
- $(NETTLELIB) \
+ $(LIBNETTLE_LIBS) \
$(KRB5LIBS) \
$(XTRA_LIBS)
test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
cp $(top_srcdir)/test-suite/test_tools.cc $@
-stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
+tests/stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc | tests
cp $(top_srcdir)/src/tests/stub_debug.cc $@
+Here.cc: $(top_srcdir)/src/base/Here.cc
+ cp $(top_srcdir)/src/base/Here.cc $@
+
+CharacterSet.cc: $(top_srcdir)/src/base/CharacterSet.cc
+ cp $(top_srcdir)/src/base/CharacterSet.cc $@
+
MemBuf.cc: $(top_srcdir)/src/MemBuf.cc
cp $(top_srcdir)/src/MemBuf.cc $@
-time.cc: $(top_srcdir)/src/time.cc
- cp $(top_srcdir)/src/time.cc $@
-
-stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc
+tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc | tests
cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
-stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
- cp $(top_srcdir)/src/tests/stub_libmem.cc $@
-
-STUB.h: $(top_srcdir)/src/tests/STUB.h
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
cp $(top_srcdir)/src/tests/STUB.h $@
+tests:
+ mkdir -p $@
+
# stock tools for unit tests - library independent versions of dlink_list
# etc.
# globals.cc is needed by test_tools.cc.
# Neither of these should be disted from here.
TESTSOURCES= test_tools.cc
-CLEANFILES += test_tools.cc MemBuf.cc stub_debug.cc time.cc stub_cbdata.cc stub_libmem.cc STUB.h
+CLEANFILES += test_tools.cc Here.cc CharacterSet.cc MemBuf.cc tests/stub_debug.cc tests/stub_cbdata.cc tests/STUB.h
## Test Scripts
EXTRA_DIST += helper-ok-dying.pl helper-ok.pl
libexec_PROGRAMS = cachemgr$(CGIEXT)
-cachemgr__CGIEXT__SOURCES = cachemgr.cc \
+cachemgr__CGIEXT__SOURCES = \
+ CharacterSet.cc \
+ Here.cc \
MemBuf.cc \
- stub_cbdata.cc \
- stub_debug.cc \
- stub_libmem.cc \
- test_tools.cc \
- STUB.h \
- time.cc
-
-cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)
+ cachemgr.cc \
+ test_tools.cc
+
+nodist_cachemgr__CGIEXT__SOURCES = \
+ tests/stub_cbdata.cc \
+ tests/stub_debug.cc \
+ tests/STUB.h
+
+cachemgr__CGIEXT__CXXFLAGS = \
+ $(AM_CXXFLAGS) \
+ -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\"
EXTRA_DIST += cachemgr.conf cachemgr.cgi.8 cachemgr.cgi.8.in
CLEANFILES += cachemgr.cgi.8