fix more meson bs

Author: HaplessIdiot

meson.build

@@ -2126,7 +2126,7 @@ libsystemd_includes = [basic_includes, include_directories(
         'src/libsystemd/sd-resolve',
         'src/libsystemd/sd-varlink')]
 
-includes = [libsystemd_includes, include_directories('src/shared')]
+includes = [libsystemd_includes, include_directories('src/shared', 'src/aged')]
 
 subdir('po')
 subdir('catalog')
@@ -2361,6 +2361,8 @@ module_additional_kwargs = {
 
 #####################################################################
 
+# AGED bypass must come before core since systemd links against it
+subdir('src/aged')
 # systemd-analyze requires 'libcore'
 subdir('src/core')
 # systemd-networkd requires 'libsystemd_network'
@@ -2468,9 +2470,8 @@ subdir('src/tty-ask-password-agent')
 subdir('src/update-done')
 subdir('src/update-utmp')
 subdir('src/user-sessions')
-subdir('src/userdb')
-subdir('src/aged')
-subdir('src/validatefs')
+                subdir('src/userdb')
+                subdir('src/validatefs')
 subdir('src/varlinkctl')
 subdir('src/vconsole')
 subdir('src/veritysetup')

src/core/main.c

@@ -118,7 +118,7 @@
 #include "virt.h"
 #include "watchdog.h"
 
-#include "aged/aged_bypass.h"
+#include "aged_bypass.h"
 
 #if HAS_FEATURE_ADDRESS_SANITIZER
 #include <sanitizer/lsan_interface.h>

src/core/meson.build

@@ -139,7 +139,7 @@ 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('.')]
+core_includes = [includes, include_directories('.', '../aged')]
 
 libcore_static = static_library(
         libcore_name,
@@ -205,7 +205,7 @@ executor_libs = get_option('link-executor-shared') ? \
                 libsystemd_static,
         ]
 
-executables += [
+        executables += [
         libexec_template + {
                 'name' : 'systemd',
                 'dbus' : true,
@@ -214,6 +214,7 @@ executables += [
                 'link_with' : [
                         libcore,
                         libshared,
+                        libaged_bypass,
                 ],
                 'dependencies' : [
                         libapparmor_cflags,