From 7409342236bc9fad7babe95b8f0a2017c54b2774 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sun, 25 Jun 2023 15:31:38 +0900 Subject: [PATCH] meson: move declarations of hibernate-resume --- meson.build | 23 +---------------------- src/hibernate-resume/meson.build | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 22 deletions(-) create mode 100644 src/hibernate-resume/meson.build diff --git a/meson.build b/meson.build index 8482d0cc8d..b495b9650d 100644 --- a/meson.build +++ b/meson.build @@ -2381,6 +2381,7 @@ subdir('src/debug-generator') subdir('src/environment-d-generator') subdir('src/fstab-generator') subdir('src/getty-generator') +subdir('src/hibernate-resume') subdir('src/home') subdir('src/hostname') subdir('src/import') @@ -2555,28 +2556,6 @@ if want_tests != 'false' depends : exe) endif -if conf.get('ENABLE_HIBERNATE') == 1 - executable( - 'systemd-hibernate-resume-generator', - 'src/hibernate-resume/hibernate-resume-generator.c', - include_directories : includes, - link_with : [libshared], - dependencies : userspace, - install_rpath : pkglibdir, - install : true, - install_dir : systemgeneratordir) - - executable( - 'systemd-hibernate-resume', - 'src/hibernate-resume/hibernate-resume.c', - include_directories : includes, - link_with : [libshared], - dependencies : userspace, - install_rpath : pkglibdir, - install : true, - install_dir : libexecdir) -endif - if conf.get('HAVE_BLKID') == 1 executable( 'systemd-gpt-auto-generator', diff --git a/src/hibernate-resume/meson.build b/src/hibernate-resume/meson.build new file mode 100644 index 0000000000..b14ea356c5 --- /dev/null +++ b/src/hibernate-resume/meson.build @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +executables += [ + generator_template + { + 'name' : 'systemd-hibernate-resume-generator', + 'conditions' : ['ENABLE_HIBERNATE'], + 'sources' : files('hibernate-resume-generator.c'), + }, + libexec_template + { + 'name' : 'systemd-hibernate-resume', + 'conditions' : ['ENABLE_HIBERNATE'], + 'sources' : files('hibernate-resume.c'), + }, +]