diff options
| author | Simon McVittie <smcv@collabora.com> | 2019-01-21 17:51:07 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2019-04-17 10:19:57 +0100 |
| commit | d9ef0226e2ff346f80c0c8ba1a0fec19c553b458 (patch) | |
| tree | 8cb2f854a945b2a8f4344a6b9a5c6e8babbc2796 /test | |
| parent | 6ef67cff6ba26645f9cbe23ffb401f3d49a66429 (diff) | |
| download | dbus-d9ef0226e2ff346f80c0c8ba1a0fec19c553b458.tar.gz | |
Adapt to API change in AX_CODE_COVERAGE version 28
AX_CODE_COVERAGE recently changed the way it embedded its Makefile rules
in the output file: instead of using @CODE_COVERAGE_RULES@, users
are now meant to include aminclude_static.am.
The new AX_CODE_COVERAGE is only in the latest autoconf-archive release,
version 2019.01.06, which is inconveniently new, so bundle everything
we need for the moment.
This requires us to stop using the deprecated CODE_COVERAGE_LDFLAGS
(which we still used to support older versions of autoconf-archive)
and replace them with CODE_COVERAGE_LIBS.
Signed-off-by: Simon McVittie <smcv@collabora.com>
(cherry picked from commit 2938c2125ebcd001e470aeac1ffac45b6b1ebe89)
Closes: dbus#265
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 6a6e1a30..746ed314 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -39,9 +39,9 @@ libdbus_testutils_la_SOURCES += \ endif libdbus_testutils_la_LIBADD = \ + $(CODE_COVERAGE_LIBS) \ $(top_builddir)/dbus/libdbus-1.la \ $(top_builddir)/dbus/libdbus-internal.la \ - $(CODE_COVERAGE_LDFLAGS) \ $(NULL) TEST_EXTENSIONS = .sh @@ -672,4 +672,4 @@ $(installable_test_meta_with_config): %_with_config.test: %$(EXEEXT) Makefile ) > $@.tmp && mv $@.tmp $@ # Add rules for code-coverage testing, as defined by AX_CODE_COVERAGE -@CODE_COVERAGE_RULES@ +include $(top_srcdir)/aminclude_static.am |