Merge pull request #11197 from keszybz/various-fixups

Various fixups

diff --cc meson.build
Simple merge

diff --cc src/libsystemd/meson.build
index 2576fe7322ad5dbca4fc52a94d319098aa918bb6,337a7eba25e9b5580ddd421dbfcc9d91dcb6e2d8..05d4ea0e7f6fef3f6ae9e4cd3b2e22e5a5851d58
--- 1/src/libsystemd/meson.build
--- 2/src/libsystemd/meson.build
+++ b/src/libsystemd/meson.build
@@@ -88,10 -88,9 +88,10 @@@ libsystemd_sources = files(''
          sd-network/network-util.h
          sd-network/sd-network.c
          sd-path/sd-path.c
 +        sd-resolve/resolve-private.h
          sd-resolve/sd-resolve.c
          sd-utf8/sd-utf8.c
- '''.split()) + id128_sources + sd_daemon_c + sd_event_sources + sd_login_c
+ '''.split()) + id128_sources + sd_daemon_sources + sd_event_sources + sd_login_sources
  
  disable_mempool_c = files('disable-mempool.c')
  

diff --cc src/systemctl/systemctl.c
Simple merge