Merged from trunk rev.14183

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

diff --git a/src/base/Makefile.am b/src/base/Makefile.am
index 3ad8e4d2ecb7536337b73ceebabadfc1da7a98b3..dc6811c0caadd9c59aad485a9b3a7c5e29409027 100644 (file)
--- a/src/base/Makefile.am
+++ b/src/base/Makefile.am
@@ -1,3 +1,9 @@
+## 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.
+##
 
 include $(top_srcdir)/src/Common.am
 include $(top_srcdir)/src/TestHeaders.am
@@ -13,12 +19,43 @@ libbase_la_SOURCES = \
        AsyncJobCalls.h \
        AsyncCallQueue.cc \
        AsyncCallQueue.h \
-       TidyPointer.h \
        CbcPointer.h \
+       CbDataList.h \
+       CharacterSet.h \
+       CharacterSet.cc \
        InstanceId.h \
+       Lock.h \
+       LookupTable.h \
+       LruMap.h \
+       Packable.h \
+       RegexPattern.cc \
+       RegexPattern.h \
        RunnersRegistry.cc \
        RunnersRegistry.h \
        Subscription.h \
        TextException.cc \
        TextException.h \
-       StringArea.h
+       TidyPointer.h
+
+EXTRA_PROGRAMS = \
+       testCharacterSet
+
+check_PROGRAMS += testCharacterSet
+TESTS += testCharacterSet
+
+testCharacterSet_SOURCES = \
+       CharacterSet.h \
+       testCharacterSet.h \
+       testCharacterSet.cc
+nodist_testCharacterSet_SOURCES = \
+       $(top_srcdir)/src/tests/stub_debug.cc \
+       $(top_srcdir)/src/tests/stub_MemBuf.cc \
+       $(top_srcdir)/src/tests/stub_cbdata.cc
+testCharacterSet_LDFLAGS = $(LIBADD_DL)
+testCharacterSet_LDADD=\
+       $(SQUID_CPPUNIT_LIBS) \
+       $(SQUID_CPPUNIT_LA) \
+       libbase.la \
+       $(COMPAT_LIB) \
+       $(XTRA_LIBS)
+testCharacterSet_DEPENDENCIES= $(SQUID_CPPUNIT_LA)