Source Format Enforcement (#665)

[thirdparty/squid.git] / src / icmp / Makefile.am

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 97f3cb12169cf66addef6ced00268310219c5ac3..3db8488b4da7124134d5d9480e7f9640d4467726 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2017 The Squid Software Foundation and contributors
+## Copyright (C) 1996-2020 The Squid Software Foundation and contributors
 ##
 ## Squid software is distributed under GPLv2+ license and includes
 ## contributions from numerous individuals and organizations.
@@ -8,11 +8,6 @@
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
 
-# TODO: get rid of this when config filename is no longer a global constant.
-#      its only here so the pinger globals.cc will link.
-DEFS += -DDEFAULT_CONFIG_FILE=NULL
-
-
 # ICMP Specific Configurations
 
 if ENABLE_PINGER
@@ -25,17 +20,17 @@ noinst_LTLIBRARIES = libicmpcore.la libicmp.la
 
 # ICMP API definition ...
 libicmpcore_la_SOURCES = \
-       Icmp.h \
-       Icmp.cc
+       Icmp.cc \
+       Icmp.h
 
 # Squid Internal ICMP helper interface
 libicmp_la_SOURCES = \
        IcmpConfig.cc \
        IcmpConfig.h \
-       IcmpSquid.h \
        IcmpSquid.cc \
-       net_db.h \
-       net_db.cc
+       IcmpSquid.h \
+       net_db.cc \
+       net_db.h
 
 libicmp_la_LIBADD= libicmpcore.la
 
@@ -45,20 +40,22 @@ COPIED_SOURCE= \
        globals.cc \
        SquidConfig.cc \
        SquidNew.cc \
+       stub_fd.cc \
        stub_HelperChildConfig.cc \
        stub_libmem.cc \
+       stub_SBuf.cc \
        STUB.h \
        time.cc
 
 # ICMP lookup helper
 pinger_SOURCES = \
        Icmp.h \
-       IcmpPinger.h \
-       IcmpPinger.cc \
-       Icmp4.h \
        Icmp4.cc \
-       Icmp6.h \
+       Icmp4.h \
        Icmp6.cc \
+       Icmp6.h \
+       IcmpPinger.cc \
+       IcmpPinger.h \
        pinger.cc
 nodist_pinger_SOURCES = $(COPIED_SOURCE)
 pinger_LDFLAGS = $(LIBADD_DL)
@@ -105,8 +102,14 @@ SquidNew.cc: $(top_srcdir)/src/SquidNew.cc
 stub_HelperChildConfig.cc: $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
        cp $(top_srcdir)/src/tests/stub_HelperChildConfig.cc $@
 
+stub_fd.cc: $(top_srcdir)/src/tests/stub_fd.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_fd.cc $@
+
 stub_libmem.cc: $(top_srcdir)/src/tests/stub_libmem.cc STUB.h
        cp $(top_srcdir)/src/tests/stub_libmem.cc $@
 
+stub_SBuf.cc: $(top_srcdir)/src/tests/stub_SBuf.cc STUB.h
+       cp $(top_srcdir)/src/tests/stub_SBuf.cc $@
+
 STUB.h: $(top_srcdir)/src/tests/STUB.h
        cp $(top_srcdir)/src/tests/STUB.h $@