meson: fix coverage build

This moves coverage.h to src/coverage/, and specifies path to coverage.h
with files() directive, to make it can be included even when located
outside of the include directories. Otherwise, libc-wrapper cannot be
built when -Db_coverage=true option is enabled.

Follow-up for 543a48b653ff25cc562ce4dcffec377a875f604e.

diff --git a/meson.build b/meson.build
index f5362ece8a70c0c56d576925e8c1b5b6d8a48293..e3e088d413a068719bea1e398bd471c4573bd15f 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -344,6 +344,7 @@ conf.set10('ENABLE_FIRST_BOOT_FULL_PRESET',                   get_option('first-
 cc = meson.get_compiler('c')
 userspace_c_args = []
 userspace_c_ld_args = []
+userspace_sources = []
 meson_build_sh = find_program('tools/meson-build.sh')
 
 want_tests = get_option('tests')
@@ -1963,9 +1964,7 @@ endif
 
 #####################################################################
 
-if get_option('b_coverage')
-        userspace_c_args += ['-include', 'coverage.h']
-endif
+subdir('src/coverage')
 
 #####################################################################
 
@@ -1980,7 +1979,7 @@ jinja2_cmdline = [meson_render_jinja2, config_h]
 userspace = declare_dependency(
         compile_args : userspace_c_args,
         link_args : userspace_c_ld_args,
-        sources : version_h,
+        sources : userspace_sources,
 )
 
 man_page_depends = []

diff --git a/src/basic/coverage.h b/src/coverage/coverage.h
similarity index 100%
rename from src/basic/coverage.h
rename to src/coverage/coverage.h

diff --git a/src/coverage/meson.build b/src/coverage/meson.build
new file mode 100644 (file)
index 0000000..fd0bcf3
--- /dev/null
+++ b/src/coverage/meson.build
@@ -0,0 +1,6 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+if get_option('b_coverage')
+        userspace_c_args += ['-include', meson.current_source_dir() / 'coverage.h']
+        userspace_sources += files('coverage.h')
+endif

diff --git a/src/version/meson.build b/src/version/meson.build
index 727ae8499959ec45f0ea5faad9d258e4d249febe..03f58697b75d213f8a62f6f4f6d3254523d1b9a1 100644 (file)
--- a/src/version/meson.build
+++ b/src/version/meson.build
@@ -13,3 +13,4 @@ version_h = custom_target('version',
                 vcs_tag ? '1' : '0',
         ])
 version_include = include_directories('.')
+userspace_sources += [version_h]