meson: rework include_directories() and finding of tools (#39956)

This is a cleanup in preparation for later additions.

src/core/meson.build

@@ -125,11 +125,12 @@ generated_sources += [load_fragment_gperf_c, load_fragment_gperf_nulstr_c, bpf_d
 libcore_sources += [load_fragment_gperf_c, load_fragment_gperf_nulstr_c, bpf_delegate_configs_inc]
 libcore_build_dir = meson.current_build_dir()
 libcore_name = 'systemd-core-@0@'.format(shared_lib_tag)
+core_includes = [includes, include_directories('.')]
 
 libcore_static = static_library(
         libcore_name,
         libcore_sources,
-        include_directories : [includes, include_directories('.')],
+        include_directories : core_includes,
         implicit_include_directories : false,
         c_args : ['-fvisibility=default'],
         dependencies : [libaudit_cflags,
@@ -157,8 +158,6 @@ libcore = shared_library(
         install : true,
         install_dir : pkglibdir)
 
-core_includes = [includes, include_directories('.')]
-
 systemd_sources = files(
         'main.c',
         'crash-handler.c',
@@ -210,7 +209,6 @@ executables += [
                 'name' : 'systemd-executor',
                 'public' : true,
                 'sources' : systemd_executor_sources,
-                'include_directories' : core_includes,
                 'link_with' : executor_libs,
                 'dependencies' : [
                         libapparmor_cflags,

src/coredump/meson.build

@@ -37,7 +37,6 @@ executables += [
         libexec_template + {
                 'name' : 'systemd-coredump',
                 'sources' : systemd_coredump_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                 'extract' : systemd_coredump_extract_sources,
                 'link_with' : [libshared],
                 'dependencies' : common_dependencies,

src/home/meson.build

@@ -63,8 +63,6 @@ executables += [
                 'dbus' : true,
                 'sources' : systemd_homed_sources,
                 'extract' : systemd_homed_extract_sources,
-                'include_directories' : includes +
-                                        include_directories('.'),
                 'dependencies' : [
                         libcrypt,
                         libm,

src/journal/meson.build

@@ -66,7 +66,6 @@ executables += [
                 'name' : 'systemd-journald',
                 'sources' : systemd_journald_sources,
                 'extract' : systemd_journald_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                 'dependencies' : [
                         liblz4_cflags,
                         libselinux_cflags,

src/login/meson.build

@@ -47,7 +47,6 @@ executables += [
                 'dbus' : true,
                 'sources' : systemd_logind_sources,
                 'extract' : systemd_logind_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                 'dependencies' : [
                         threads,
                 ],

src/nsresourced/meson.build

@@ -32,7 +32,6 @@ executables += [
                 'name' : 'systemd-nsresourced',
                 'sources' : systemd_nsresourced_sources,
                 'extract' : systemd_nsresourced_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                 'dependencies' : threads,
         },
         libexec_template + {

src/resolve/meson.build

@@ -83,7 +83,6 @@ executables += [
                 'dbus' : true,
                 'sources' : systemd_resolved_sources,
                 'extract' : systemd_resolved_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
         },
         executable_template + resolve_common_template + {
                 'name' : 'resolvectl',

src/sleep/meson.build

@@ -5,7 +5,6 @@ executables += [
                 'name' : 'systemd-sleep',
                 'sources' : files('sleep.c'),
                 'extract' : files('battery-capacity.c'),
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
         },
         test_template + {
                 'sources' : files('test-battery-capacity.c'),

src/timesync/meson.build

@@ -34,7 +34,6 @@ executables += [
                 'name' : 'systemd-timesyncd',
                 'sources' : timesyncd_sources,
                 'extract' : timesyncd_extract_sources,
-                'include_directories' : [libexec_template['include_directories'], include_directories('.')],
                 'link_with' : timesyncd_link_with,
                 'dependencies' : [
                         libm,

src/version/meson.build

@@ -7,7 +7,7 @@ version_h = custom_target('version',
         output : 'version.h',
         capture : true,
         command : [
-                meson.project_source_root() / 'tools/vcs-tag.sh',
+                vcs_tag_sh,
                 '@INPUT@',
                 get_option('mode'),
                 vcs_tag ? '1' : '0',