summaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorJeremy C. Reed <jreed@isc.org>2015-06-24 21:40:55 +0200
committerJeremy C. Reed <jreed@isc.org>2015-06-24 21:40:55 +0200
commita47202ced60f0981ab9c6bf206dd21447e426e6a (patch)
tree5e5a347eb8d69578e7dee1e52678778a9434be77 /Makefile.am
parent[trac3483] remove rest of the python code coverage (diff)
parent[master] ChangeLog updated after 3918 merge. (diff)
downloadkea-a47202ced60f0981ab9c6bf206dd21447e426e6a.tar.xz
kea-a47202ced60f0981ab9c6bf206dd21447e426e6a.zip
Merge branch 'master' into trac3483
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 1b4149f571..ebd8e14ff1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
# ^^^^^^^^ This has to be the first line and cannot come later in this
# Makefile.am due to some bork in some versions of autotools.
-SUBDIRS = compatcheck doc . ext src tests m4macros
+SUBDIRS = compatcheck doc . ext src m4macros
USE_LCOV=@USE_LCOV@
LCOV=@LCOV@
GENHTML=@GENHTML@
@@ -72,7 +72,6 @@ endif
if HAVE_OPENSSL
openssl/\* \
endif
- tests/\* \
unittests/\* \
\*_unittests.cc \
\*_unittest.cc \