Source Format Enforcement (#1234)

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

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 66d30c713b121a5ac2fb5755de4409cf2d2e7d72..2b3309b39861a8c102ae7cdca6cc4ced8c452556 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -1,27 +1,28 @@
-#
-#  Makefile for the Squid Object Cache server
-#
-#  Uncomment and customize the following to suit your needs:
-#
+## 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.
+## Please see the COPYING and CONTRIBUTORS files for details.
+##
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 ## we need our local files too (but avoid -I. at all costs)
 AM_CPPFLAGS += -I$(srcdir)
 
-SUBDIRS = purge squidclient
-EXTRA_DIST = 
-man_MANS = 
-DISTCLEANFILES = 
+SUBDIRS= apparmor helper-mux purge squidclient systemd sysvinit
+EXTRA_DIST=
+man_MANS=
+DISTCLEANFILES=
 
-LDADD = \
+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)
 
@@ -30,42 +31,60 @@ include $(top_srcdir)/doc/manuals/Substitute.am
 ## Several files need to be shared but we cannot depend on the other
 ## directories to be built.
 test_tools.cc: $(top_srcdir)/test-suite/test_tools.cc
-       cp $(top_srcdir)/test-suite/test_tools.cc .
+       cp $(top_srcdir)/test-suite/test_tools.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 $@
+
+tests/stub_cbdata.cc: $(top_srcdir)/src/tests/stub_cbdata.cc | tests
+       cp $(top_srcdir)/src/tests/stub_cbdata.cc $@
 
-stub_debug.cc: $(top_srcdir)/src/tests/stub_debug.cc
-       cp $(top_srcdir)/src/tests/stub_debug.cc .
+tests/STUB.h: $(top_srcdir)/src/tests/STUB.h | tests
+       cp $(top_srcdir)/src/tests/STUB.h $@
 
-time.cc: $(top_srcdir)/src/time.cc
-       cp $(top_srcdir)/src/time.cc .
+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 stub_debug.cc time.cc
-
-## ##### helper-mux #####
-
-libexec_SCRIPTS = helper-mux.pl
-EXTRA_DIST += helper-mux.pl helper-mux.README
+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
 
-
 ## ##### cachemgr.cgi  #####
 
 DEFAULT_CACHEMGR_CONFIG = $(sysconfdir)/cachemgr.conf
 
 libexec_PROGRAMS = cachemgr$(CGIEXT)
 
-cachemgr__CGIEXT__SOURCES = cachemgr.cc \
-       stub_debug.cc \
-       test_tools.cc \
-       time.cc
+cachemgr__CGIEXT__SOURCES = \
+       CharacterSet.cc \
+       Here.cc \
+       MemBuf.cc \
+       cachemgr.cc \
+       test_tools.cc
 
-cachemgr__CGIEXT__CXXFLAGS = -DDEFAULT_CACHEMGR_CONFIG=\"$(DEFAULT_CACHEMGR_CONFIG)\" $(AM_CXXFLAGS)
+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
@@ -74,8 +93,6 @@ man_MANS += cachemgr.cgi.8
 cachemgr.cgi.8: $(srcdir)/cachemgr.cgi.8.in Makefile
        $(SUBSTITUTE) < $(srcdir)/cachemgr.cgi.8.in > $@
 
-
-
 ## Shared
 
 install-data-local: