diff options
| author | Jeremy C. Reed <jreed@ISC.org> | 2012-05-21 15:29:45 +0200 |
|---|---|---|
| committer | Jeremy C. Reed <jreed@ISC.org> | 2012-05-21 15:29:45 +0200 |
| commit | 4275729c33df509401c2242ebf1f0b35d89766f1 (patch) | |
| tree | cde732f8df10844ae7ced4aa1ce8670e9c2de00a /Makefile.am | |
| parent | [trac1687] reorganize (diff) | |
| parent | [master] Merge branch 'trac1207' (diff) | |
| download | kea-4275729c33df509401c2242ebf1f0b35d89766f1.tar.xz kea-4275729c33df509401c2242ebf1f0b35d89766f1.zip | |
[trac1687]Merge branch 'master' into trac1687
merge in master
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 5c6d0bf9a9..6871f82951 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,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 USE_LCOV=@USE_LCOV@ LCOV=@LCOV@ @@ -79,7 +83,7 @@ report-coverage: report-cpp-coverage report-python-coverage # for static C++ check using cppcheck (when available) cppcheck: - cppcheck --enable=all --suppressions src/cppcheck-suppress.lst \ + cppcheck --enable=all --suppressions src/cppcheck-suppress.lst --inline-suppr \ --quiet --error-exitcode=1 \ --template '{file}:{line}: check_fail: {message} ({severity},{id})' \ src @@ -402,3 +406,6 @@ EXTRA_DIST += ext/asio/asio/system_error.hpp EXTRA_DIST += ext/asio/asio/deadline_timer.hpp EXTRA_DIST += ext/asio/asio/stream_socket_service.hpp EXTRA_DIST += ext/coroutine/coroutine.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = dns++.pc |