Source Format Enforcement (#1234)

[thirdparty/squid.git] / tools / Makefile.am

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 80a09f7d8c695692de4dd69e3b00016e98de2330..2b3309b39861a8c102ae7cdca6cc4ced8c452556 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2022 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.
@@ -18,10 +18,11 @@ DISTCLEANFILES=
 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)
 
@@ -44,9 +45,6 @@ CharacterSet.cc: $(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 $@
-
 tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc | tests
        cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
@@ -61,7 +59,7 @@ tests:
 # globals.cc is needed by test_tools.cc.
 # Neither of these should be disted from here.
 TESTSOURCES= test_tools.cc
-CLEANFILES += test_tools.cc Here.cc CharacterSet.cc MemBuf.cc tests/stub_debug.cc time.cc tests/stub_cbdata.cc tests/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
@@ -77,8 +75,7 @@ cachemgr__CGIEXT__SOURCES = \
        Here.cc \
        MemBuf.cc \
        cachemgr.cc \
-       test_tools.cc \
-       time.cc
+       test_tools.cc
 
 nodist_cachemgr__CGIEXT__SOURCES = \
        tests/stub_cbdata.cc \