SourceFormat Enforcement

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

diff --git a/src/icmp/Makefile.am b/src/icmp/Makefile.am
index 66a2a59a266ef858314298d31ccd36bce0680d04..5295be180a1a332cd545c3e122da5deb8d51078f 100644 (file)
--- a/src/icmp/Makefile.am
+++ b/src/icmp/Makefile.am
@@ -1,22 +1,18 @@
-#
-#  Makefile for the Squid ICMP and Network Measurement API
-#
+## Copyright (C) 1996-2015 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.
+##
 
-# Housekeeping, shared by all Squid Makefiles.
-# TODO: make this set by configure?
-AM_CFLAGS = @SQUID_CFLAGS@
-AM_CXXFLAGS = @SQUID_CXXFLAGS@
-DEFS = @DEFS@
-
-INCLUDES = -I$(top_srcdir)/src @SQUID_CPPUNIT_INC@ -I$(top_srcdir)/include -I$(top_builddir)/lib
-$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
+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 testIcmp will link .
 DEFS += -DDEFAULT_CONFIG_FILE=NULL
 
 
-
 # ICMP Specific Configurations
 
 if ENABLE_PINGER
@@ -33,6 +29,20 @@ libexec_PROGRAMS = $(PINGER)
 
 noinst_LTLIBRARIES = libicmp-core.la libicmp.la
 
+SBUF_SOURCE= \
+       $(top_srcdir)/src/base/CharacterSet.h \
+       $(top_srcdir)/src/SBuf.h \
+       $(top_srcdir)/src/SBuf.cc \
+       $(top_srcdir)/src/MemBlob.h \
+       $(top_srcdir)/src/MemBlob.cc \
+       $(top_srcdir)/src/OutOfBoundsException.h \
+       $(top_srcdir)/src/SBufExceptions.h \
+       $(top_srcdir)/src/SBufExceptions.cc \
+       $(top_srcdir)/src/String.cc \
+       $(top_srcdir)/src/SquidString.h \
+       $(top_srcdir)/src/base/TextException.h \
+       $(top_srcdir)/src/base/TextException.cc
+
 # ICMP API definition ...
 libicmp_core_la_SOURCES = \
        Icmp.h \
@@ -48,6 +58,7 @@ libicmp_la_SOURCES = \
 
 # ICMP lookup helper
 pinger_SOURCES = \
+       Icmp.h \
        IcmpPinger.h \
        IcmpPinger.cc \
        Icmp4.h \
@@ -59,22 +70,19 @@ pinger_SOURCES = \
 # depends on these but install/dist is done elsewhere.
 # TODO: remove when these are cleaned up in their own way.
 nodist_pinger_SOURCES = \
-       Icmp.h \
-       ../debug.cc \
-       ../globals.cc \
-       ../time.cc \
-       ../SquidConfig.cc \
-       ../SquidNew.cc \
-       ../stubQosConfig.cc
+       $(top_srcdir)/src/debug.cc \
+       $(top_builddir)/src/globals.cc \
+       $(top_srcdir)/src/time.cc \
+       $(top_srcdir)/src/SquidConfig.cc \
+       $(top_srcdir)/src/SquidNew.cc \
+       $(top_srcdir)/src/tests/stub_HelperChildConfig.cc
 
 pinger_LDFLAGS = $(LIBADD_DL)
 pinger_LDADD=\
        libicmp-core.la \
-       $(top_builddir)/lib/libmiscutil.a
-pinger_DEPENDENCIES= \
-       libicmp-core.la \
-       $(top_builddir)/lib/libmiscutil.a
-
+       ../ip/libip.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
 
 
 ##install-pinger:
@@ -91,36 +99,28 @@ pinger_DEPENDENCIES= \
 ##     fi
 
 
-check_PROGRAMS= testIcmp testHeaders
-TESTS= $(check_PROGRAMS)
-
-## Special Universal .h dependency test script
-## aborts if error encountered
-testHeaders: $(top_srcdir)/src/icmp/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/icmp/" || exit 1
-
-## No such file...
-testHeaders.c:
-       touch testHeaders.c
-
+check_PROGRAMS += testIcmp
+TESTS += testIcmp
 
 ## Tests of the ICMP base module.
 # Its used by pinger so SHOULD NOT require more dependancies! :-(
-testIcmp_SOURCES=\
+testIcmp_SOURCES = \
        Icmp.h \
        testIcmp.h \
-       testIcmp.cc \
-       ../tests/testMain.cc \
-       ../SquidTime.h \
-       ../time.cc \
-       ../../test-suite/test_tools.cc \
-       ../globals.cc
+       testIcmp.cc
+nodist_testIcmp_SOURCES = \
+       $(top_srcdir)/src/SquidTime.h \
+       $(top_srcdir)/src/tests/stub_debug.cc \
+       $(top_srcdir)/src/time.cc \
+       $(top_srcdir)/test-suite/test_tools.cc \
+       $(top_builddir)/src/globals.cc
 testIcmp_LDFLAGS = $(LIBADD_DL)
 testIcmp_LDADD=\
-       @SQUID_CPPUNIT_LIBS@ \
-       @SQUID_CPPUNIT_LA@ \
-       libicmp-core.la \
-       $(top_builddir)/lib/libmiscutil.a
-testIcmp_DEPENDENCIES= @SQUID_CPPUNIT_LA@ \
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
        libicmp-core.la \
-       $(top_builddir)/lib/libmiscutil.a
+       ../ip/libip.la \
+       ../base/libbase.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+testIcmp_DEPENDENCIES= $(SQUID_CPPUNIT_LA)