diff options
author | Jeremy C. Reed <jreed@ISC.org> | 2012-08-02 22:30:53 +0200 |
---|---|---|
committer | Jeremy C. Reed <jreed@ISC.org> | 2012-08-02 22:30:53 +0200 |
commit | b076fa5794d39ffc4fbe3803e7c9870414e04236 (patch) | |
tree | bb6aab51c3521e434883dc106899328b386ec4fc /Makefile.am | |
parent | [1687] make sure sockcreator manual is installed (diff) | |
parent | [master] remove some extra white space (diff) | |
download | kea-b076fa5794d39ffc4fbe3803e7c9870414e04236.tar.xz kea-b076fa5794d39ffc4fbe3803e7c9870414e04236.zip |
[1687]Merge branch 'master' into trac1687
fixed conflicts by removing already removed files
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index c7f7425b9e..0fbb78244f 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 src tests +SUBDIRS = compatcheck doc . src tests USE_LCOV=@USE_LCOV@ LCOV=@LCOV@ GENHTML=@GENHTML@ @@ -18,6 +18,24 @@ DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_GTEST_CONFIGURE_FLAG) dist_doc_DATA = AUTHORS COPYING ChangeLog README +.PHONY: check-valgrind check-valgrind-suppress + +check-valgrind: +if HAVE_VALGRIND + @VALGRIND_COMMAND="$(VALGRIND) -q --gen-suppressions=all --track-origins=yes --num-callers=48 --leak-check=full --fullpath-after=" \ + make -C $(abs_top_builddir) check +else + @echo "*** Valgrind is required for check-valgrind ***"; exit 1; +endif + +check-valgrind-suppress: +if HAVE_VALGRIND + @VALGRIND_COMMAND="$(VALGRIND) -q --gen-suppressions=all --error-exitcode=1 --suppressions=$(abs_top_srcdir)/src/valgrind-suppressions --suppressions=$(abs_top_srcdir)/src/valgrind-suppressions.revisit --num-callers=48 --leak-check=full --fullpath-after=" \ + make -C $(abs_top_builddir) check +else + @echo "*** Valgrind is required for check-valgrind-suppress ***"; exit 1; +endif + clean-cpp-coverage: @if [ $(USE_LCOV) = yes ] ; then \ $(LCOV) --directory . --zerocounters; \ @@ -413,3 +431,9 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dns++.pc CLEANFILES = $(abs_top_builddir)/logger_lockfile + +if HAVE_GTEST_SOURCE +noinst_LIBRARIES = libgtest.a +libgtest_a_CXXFLAGS = $(GTEST_INCLUDES) $(AM_CXXFLAGS) +nodist_libgtest_a_SOURCES = $(GTEST_SOURCE)/src/gtest-all.cc +endif |