diff options
| author | Jeremy C. Reed <jreed@ISC.org> | 2012-06-15 17:15:17 +0200 |
|---|---|---|
| committer | Jeremy C. Reed <jreed@ISC.org> | 2012-06-15 17:15:17 +0200 |
| commit | 8958f15ce8c14539aaa8b3e6fa11cc58f7f90b41 (patch) | |
| tree | d17df4100f9dbd710583ce43914949fb25bea170 /Makefile.am | |
| parent | [trac1687] output yes in configure output for finding dependencies for docs (diff) | |
| parent | Fix compilation (diff) | |
| download | kea-8958f15ce8c14539aaa8b3e6fa11cc58f7f90b41.tar.xz kea-8958f15ce8c14539aaa8b3e6fa11cc58f7f90b41.zip | |
[trac1687]Merge branch 'master' into trac1687
merge in master; fix one conflict
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 6871f82951..c7f7425b9e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,6 +16,8 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations # Use same --with-gtest flag if set DISTCHECK_CONFIGURE_FLAGS += $(DISTCHECK_GTEST_CONFIGURE_FLAG) +dist_doc_DATA = AUTHORS COPYING ChangeLog README + clean-cpp-coverage: @if [ $(USE_LCOV) = yes ] ; then \ $(LCOV) --directory . --zerocounters; \ @@ -409,3 +411,5 @@ EXTRA_DIST += ext/coroutine/coroutine.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = dns++.pc + +CLEANFILES = $(abs_top_builddir)/logger_lockfile |