SourceFormat Enforcement

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

diff --git a/src/ip/Makefile.am b/src/ip/Makefile.am
index 4961985eab4d137532aa1979d8519d2a0f541ff6..592dadf875cd7a2fa18612c4fc40e90ecfeebbc0 100644 (file)
--- a/src/ip/Makefile.am
+++ b/src/ip/Makefile.am
@@ -1,60 +1,23 @@
-#
-#  Makefile for the Squid IP layer API
-#
+## Copyright (C) 1996-2017 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@
-CLEANFILES = 
-
-INCLUDES = \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/include \
-       -I$(top_builddir)/lib \
-       -I$(top_srcdir)/src \
-       @SQUID_CPPUNIT_INC@ 
-
-$(OBJS): $(top_srcdir)/include/version.h $(top_srcdir)/include/autoconf.h
-
-
-# IP Specific Configurations
+include $(top_srcdir)/src/Common.am
+include $(top_srcdir)/src/TestHeaders.am
 
 noinst_LTLIBRARIES = libip.la
 
 libip_la_SOURCES = \
-       IpAddress.h \
-       IpAddress.cc \
-       IpIntercept.h \
-       IpIntercept.cc \
+       forward.h \
+       Address.h \
+       Address.cc \
+       Intercept.h \
+       Intercept.cc \
        QosConfig.h \
-       QosConfig.cc
-
-
-check_PROGRAMS= testHeaders testIpAddress
-TESTS= $(check_PROGRAMS)
-
-## Special Universal .h dependency test script
-## aborts if error encountered
-testHeaders: $(top_srcdir)/src/ip/*.h
-       $(SHELL) $(top_srcdir)/test-suite/testheaders.sh "$(CXXCOMPILE)" "$(top_srcdir)/src/ip/" || exit 1
-
-## No such file...
-testHeaders.c:
-       touch testHeaders.c
-CLEANFILES += testHeaders.c
-
-
-testIpAddress_SOURCES= \
-       testIpAddress.cc \
-       testIpAddress.h
-nodist_testIpAddress_SOURCES= \
-       ../tests/testMain.cc
-testIpAddress_LDADD= \
-       $(top_builddir)/compat/libcompat.la \
-       libip.la \
-       -L$(top_builddir)/lib -lmiscutil \
-       @SQUID_CPPUNIT_LA@ \
-       @SQUID_CPPUNIT_LIBS@
-testIpAddress_LDFLAGS= $(LIBADD_DL)
+       QosConfig.cc \
+       Qos.cci \
+       tools.cc \
+       tools.h