meson: move declarations of socket-proxy, udevadm, quotacheck, and shutdown

diff --git a/meson.build b/meson.build
index afcdb20f022f4ad7c6dfdb751bd1ce5da3cafdf2..94555ba91bcd535e7ec84c0f5a1e24f1844266a6 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2213,7 +2213,6 @@ subdir('src/fundamental')
 subdir('src/basic')
 subdir('src/libsystemd')
 subdir('src/shared')
-subdir('src/udev')
 subdir('src/libudev')
 
 libsystemd = shared_library(
@@ -2369,6 +2368,8 @@ subdir('src/core')
 subdir('src/journal')
 # systemd-networkd requires 'libsystemd_network'
 subdir('src/libsystemd-network')
+# hwdb requires 'udev_link_with' and 'udev_rpath'
+subdir('src/udev')
 
 subdir('src/ac-power')
 subdir('src/analyze')
@@ -2424,6 +2425,7 @@ subdir('src/partition')
 subdir('src/path')
 subdir('src/portable')
 subdir('src/pstore')
+subdir('src/quotacheck')
 subdir('src/random-seed')
 subdir('src/rc-local-generator')
 subdir('src/remount-fs')
@@ -2436,6 +2438,7 @@ subdir('src/run-generator')
 subdir('src/shutdown')
 subdir('src/sleep')
 subdir('src/socket-activate')
+subdir('src/socket-proxy')
 subdir('src/stdio-bridge')
 subdir('src/sysctl')
 subdir('src/sysext')
@@ -2608,10 +2611,6 @@ if conf.get('HAVE_BLKID') == 1 and conf.get('ENABLE_BOOTLOADER') == 1
         endif
 endif
 
-meson.add_install_script(meson_make_symlink,
-                         bindir / 'udevadm',
-                         libexecdir / 'systemd-udevd')
-
 if want_tests != 'false'
         systemctl = executables_by_name.get('systemctl')
         systemd_id128 = executables_by_name.get('systemd-id128')
@@ -2673,77 +2672,14 @@ if conf.get('ENABLE_HWDB') == 1
         endif
 endif
 
-if conf.get('ENABLE_QUOTACHECK') == 1
-        executable(
-                'systemd-quotacheck',
-                'src/quotacheck/quotacheck.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
-public_programs += executable(
-        'systemd-socket-proxyd',
-        'src/socket-proxy/socket-proxyd.c',
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [threads,
-                        userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-udevadm = executable(
-        'udevadm',
-        udevadm_sources,
-        include_directories : includes,
-        link_with : [libudevd_core],
-        dependencies : [libacl,
-                        libblkid,
-                        libidn,
-                        libkmod,
-                        threads,
-                        userspace],
-        install_rpath : udev_rpath,
-        install : true)
-public_programs += udevadm
-
 if want_tests != 'false'
+        exe = executables_by_name.get('udevadm')
         test('udev-rules-check',
-             udevadm,
+             exe,
              suite : 'dist',
              args : ['verify', '--resolve-names=never', all_rules])
 endif
 
-executable(
-        'systemd-shutdown',
-        systemd_shutdown_sources,
-        include_directories : includes,
-        link_with : [libshared],
-        dependencies : [libmount,
-                        userspace],
-        install_rpath : pkglibdir,
-        install : true,
-        install_dir : libexecdir)
-
-executable(
-        'systemd-shutdown.standalone',
-        systemd_shutdown_sources,
-        include_directories : includes,
-        c_args : '-DSTANDALONE',
-        link_with : [libshared_static,
-                     libbasic,
-                     libsystemd_static],
-        dependencies : [libmount,
-                        userspace],
-        build_by_default: have_standalone_binaries,
-        install_rpath : pkglibdir,
-        install : have_standalone_binaries,
-        install_dir : libexecdir)
-
 executable(
         'systemd-update-done',
         'src/update-done/update-done.c',

diff --git a/src/quotacheck/meson.build b/src/quotacheck/meson.build
new file mode 100644 (file)
index 0000000..0a3c3e3
--- /dev/null
+++ b/src/quotacheck/meson.build
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-quotacheck',
+                'conditions' : ['ENABLE_QUOTACHECK'],
+                'sources' : files('quotacheck.c'),
+        },
+]

diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build
index 653888269246dfaeff740cae452146eb2094242c..ca7ea3840d6a6fe70d328fa6d69d9644699d36a9 100644 (file)
--- a/src/shutdown/meson.build
+++ b/src/shutdown/meson.build
@@ -9,6 +9,27 @@ systemd_shutdown_sources = files(
         'umount.c',
 )
 
+executables += [
+        libexec_template + {
+                'name' : 'systemd-shutdown',
+                'sources' : systemd_shutdown_sources,
+                'dependencies' : libmount,
+        },
+        libexec_template + {
+                'name' : 'systemd-shutdown.standalone',
+                'sources' : systemd_shutdown_sources,
+                'c_args' : '-DSTANDALONE',
+                'link_with' : [
+                        libbasic,
+                        libshared_static,
+                        libsystemd_static,
+                ],
+                'dependencies' : libmount,
+                'build_by_default' : have_standalone_binaries,
+                'install' : have_standalone_binaries,
+        },
+]
+
 tests += [
         {
                 'sources' : files(

diff --git a/src/socket-proxy/meson.build b/src/socket-proxy/meson.build
new file mode 100644 (file)
index 0000000..52d63a8
--- /dev/null
+++ b/src/socket-proxy/meson.build
@@ -0,0 +1,10 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+executables += [
+        libexec_template + {
+                'name' : 'systemd-socket-proxyd',
+                'public' : true,
+                'sources' : files('socket-proxyd.c'),
+                'dependencies' : threads,
+        },
+]

diff --git a/src/udev/meson.build b/src/udev/meson.build
index baedcaa2fe827aa8c7e72671c7a48f58d0409783..932a7186515e91b69d92a0ae190078e8b0451c23 100644 (file)
--- a/src/udev/meson.build
+++ b/src/udev/meson.build
@@ -116,6 +116,23 @@ libudevd_core = static_library(
                         userspace],
         build_by_default : false)
 
+executables += [
+        executable_template + {
+                'name' : 'udevadm',
+                'public' : true,
+                'sources' : udevadm_sources,
+                'link_with' : [libudevd_core],
+                'dependencies' : [
+                        libacl,
+                        libblkid,
+                        libidn,
+                        libkmod,
+                        threads,
+                ],
+                'install_rpath' : udev_rpath,
+        },
+]
+
 udev_progs = [['ata_id/ata_id.c'],
               ['cdrom_id/cdrom_id.c'],
               ['fido_id/fido_id.c',
@@ -150,6 +167,10 @@ foreach prog : udev_progs
         public_programs += exe
 endforeach
 
+meson.add_install_script(meson_make_symlink,
+                         bindir / 'udevadm',
+                         libexecdir / 'systemd-udevd')
+
 if install_sysconfdir_samples
         install_data('udev.conf',
                      install_dir : sysconfdir / 'udev')