meson: move declarations of several generators

diff --git a/meson.build b/meson.build
index eca9b4325c33a34a0688b14c3376e19d1468d305..8ae87f7c90388a640cb506703ad1e6382b9b4486 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -2404,6 +2404,7 @@ subdir('src/oom')
 subdir('src/partition')
 subdir('src/portable')
 subdir('src/pstore')
+subdir('src/rc-local-generator')
 subdir('src/resolve')
 subdir('src/rfkill')
 subdir('src/rpm')
@@ -2414,6 +2415,7 @@ subdir('src/sysext')
 subdir('src/system-update-generator')
 subdir('src/systemctl')
 subdir('src/sysupdate')
+subdir('src/sysv-generator')
 subdir('src/timedate')
 subdir('src/timesync')
 subdir('src/tmpfiles')
@@ -2579,57 +2581,6 @@ meson.add_install_script(meson_make_symlink,
                          bindir / 'udevadm',
                          libexecdir / 'systemd-udevd')
 
-if conf.get('HAVE_SYSV_COMPAT') == 1
-        exe = executable(
-                'systemd-sysv-generator',
-                'src/sysv-generator/sysv-generator.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : systemgeneratordir)
-
-        sysv_generator_test_py = find_program('test/sysv-generator-test.py')
-        if want_tests != 'false'
-                test('sysv-generator-test',
-                     sysv_generator_test_py,
-                     depends : exe)
-        endif
-
-        executable(
-                'systemd-rc-local-generator',
-                'src/rc-local-generator/rc-local-generator.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : systemgeneratordir)
-endif
-
-if conf.get('ENABLE_XDG_AUTOSTART') == 1
-        executable(
-                'systemd-xdg-autostart-generator',
-                systemd_xdg_autostart_generator_sources,
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : usergeneratordir)
-
-        executable(
-                'systemd-xdg-autostart-condition',
-                'src/xdg-autostart-generator/xdg-autostart-condition.c',
-                include_directories : includes,
-                link_with : [libshared],
-                dependencies : userspace,
-                install_rpath : pkglibdir,
-                install : true,
-                install_dir : libexecdir)
-endif
-
 if conf.get('ENABLE_HOSTNAMED') == 1
         dbus_programs += executable(
                 'systemd-hostnamed',

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

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

diff --git a/src/xdg-autostart-generator/meson.build b/src/xdg-autostart-generator/meson.build
index c7e566088141242780f9fe020d7c75ecf7cd142a..8eea9322aeaaf415628b04c542efd6d5ed29c4bc 100644 (file)
--- a/src/xdg-autostart-generator/meson.build
+++ b/src/xdg-autostart-generator/meson.build
@@ -5,6 +5,20 @@ systemd_xdg_autostart_generator_sources = files(
         'xdg-autostart-service.c',
 )
 
+executables += [
+        executable_template + {
+                'name' : 'systemd-xdg-autostart-generator',
+                'conditions' : ['ENABLE_XDG_AUTOSTART'],
+                'sources' : systemd_xdg_autostart_generator_sources,
+                'install_dir' : usergeneratordir,
+        },
+        libexec_template + {
+                'name' : 'systemd-xdg-autostart-condition',
+                'conditions' : ['ENABLE_XDG_AUTOSTART'],
+                'sources' : files('xdg-autostart-condition.c'),
+        },
+]
+
 tests += [
         {
                 'sources' : files(