SourceFormat Enforcement

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

diff --git a/lib/Makefile.am b/lib/Makefile.am
index dce561a6a43ca3b4dcc095484cdc30a26b03d1a7..d73181d2318efa58877ebc694fe8dadb7b8ddf02 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (C) 1996-2014 The Squid Software Foundation and contributors
+## 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.
@@ -7,6 +7,8 @@
 
 include $(top_srcdir)/src/Common.am
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 DIST_SUBDIRS = ntlmauth profiler rfcnb smblib libTrie snmplib
 SUBDIRS=
 EXTRA_DIST=
@@ -65,9 +67,6 @@ libmisccontainers_la_SOURCES = \
        hash.cc
 
 libmiscutil_la_SOURCES = \
-       MemPool.cc \
-       MemPoolChunked.cc \
-       MemPoolMalloc.cc \
        getfullhostname.c \
        heap.c \
        iso3307.c \
@@ -82,24 +81,33 @@ libmiscutil_la_SOURCES = \
        util.c \
        xusleep.c
 
-TESTS += tests/testAll
+TESTS += tests/testRFC1035 tests/testRFC1738
 
-check_PROGRAMS += tests/testAll
+check_PROGRAMS += tests/testRFC1035 tests/testRFC1738
 
-tests_testAll_SOURCES= \
+tests_testRFC1035_SOURCES= \
        tests/testRFC1035.h \
-       tests/testRFC1035.cc \
+       tests/testRFC1035.cc
+
+tests_testRFC1035_LDADD= \
+       $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
+       $(top_builddir)/lib/libmiscencoding.la \
+       $(top_builddir)/lib/libmiscutil.la \
+       $(COMPAT_LIB)
+
+tests_testRFC1035_LDFLAGS = $(LIBADD_DL)
+
+tests_testRFC1738_SOURCES= \
        tests/testRFC1738.h \
-       tests/testRFC1738.cc \
-       tests/testMain.cc
+       tests/testRFC1738.cc
 
-tests_testAll_LDADD= \
+tests_testRFC1738_LDADD= \
        $(SQUID_CPPUNIT_LA) $(SQUID_CPPUNIT_LIBS) \
        $(top_builddir)/lib/libmiscencoding.la \
        $(top_builddir)/lib/libmiscutil.la \
        $(COMPAT_LIB)
 
-tests_testAll_LDFLAGS = $(LIBADD_DL)
+tests_testRFC1738_LDFLAGS = $(LIBADD_DL)
 
 
 ## Special Universal .h dependency test script