SourceFormat Enforcement

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

diff --git a/compat/Makefile.am b/compat/Makefile.am
index 3edb18c0e4207ac45aefc098b16e0ed7b869615b..b7a4e0b6be4dff302f7278694d4f21c4a9eb50a0 100644 (file)
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2015 The Squid Software Foundation and contributors
+## 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.
@@ -10,14 +10,12 @@
 
 include $(top_srcdir)/src/Common.am
 
-AUTOMAKE_OPTIONS = subdir-objects
-
 # Ideally this would be 100% inline functions and macro wrappers.
 
 # Port Specific Configurations
 
-noinst_LTLIBRARIES = libcompat-squid.la
-libcompat_squid_la_SOURCES = \
+noinst_LTLIBRARIES = libcompatsquid.la
+libcompatsquid_la_SOURCES = \
        assert.cc \
        assert.h \
        cmsg.h \
@@ -88,7 +86,7 @@ libcompat_squid_la_SOURCES = \
        os/solaris.h \
        os/sunos.h
 
-libcompat_squid_la_LIBADD= $(LTLIBOBJS)
+libcompatsquid_la_LIBADD= $(LTLIBOBJS)
 
 check_PROGRAMS += testPreCompiler
 TESTS += testPreCompiler
@@ -96,7 +94,7 @@ TESTS += testPreCompiler
 testPreCompiler_SOURCES= \
        testPreCompiler.h \
        testPreCompiler.cc
-testPreCompiler_LDADD= $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS)
+testPreCompiler_LDADD= $(LIBCPPUNIT_LIBS)
 testPreCompiler_LDFLAGS=
 
 # os/ subdir prevents us using src/TestHeaders.am