From c35125732f0b845f256d6b48fd2577c6fe8c0b0c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 4 Jan 2021 20:12:28 +0900 Subject: [PATCH] meson: move definition of systemctl source files --- meson.build | 83 +-------------------------------------- src/systemctl/meson.build | 83 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 81 deletions(-) create mode 100644 src/systemctl/meson.build diff --git a/meson.build b/meson.build index 82da1a463a..5b9beebaf9 100644 --- a/meson.build +++ b/meson.build @@ -1729,6 +1729,7 @@ subdir('src/userdb') subdir('src/home') subdir('src/nspawn') subdir('src/resolve') +subdir('src/systemctl') subdir('src/timedate') subdir('src/timesync') subdir('src/tmpfiles') @@ -2142,89 +2143,9 @@ public_programs += executable( install_rpath : rootlibexecdir, install : true) -if get_option('link-systemctl-shared') - systemctl_link_with = [libshared] -else - systemctl_link_with = [libsystemd_static, - libshared_static, - libbasic_gcrypt] -endif - public_programs += executable( 'systemctl', - 'src/systemctl/systemctl-add-dependency.c', - 'src/systemctl/systemctl-add-dependency.h', - 'src/systemctl/systemctl-cancel-job.c', - 'src/systemctl/systemctl-cancel-job.h', - 'src/systemctl/systemctl-clean-or-freeze.c', - 'src/systemctl/systemctl-clean-or-freeze.h', - 'src/systemctl/systemctl-compat-halt.c', - 'src/systemctl/systemctl-compat-halt.h', - 'src/systemctl/systemctl-compat-runlevel.c', - 'src/systemctl/systemctl-compat-runlevel.h', - 'src/systemctl/systemctl-compat-shutdown.c', - 'src/systemctl/systemctl-compat-shutdown.h', - 'src/systemctl/systemctl-compat-telinit.c', - 'src/systemctl/systemctl-compat-telinit.h', - 'src/systemctl/systemctl-daemon-reload.c', - 'src/systemctl/systemctl-daemon-reload.h', - 'src/systemctl/systemctl-edit.c', - 'src/systemctl/systemctl-edit.h', - 'src/systemctl/systemctl-enable.c', - 'src/systemctl/systemctl-enable.h', - 'src/systemctl/systemctl-is-active.c', - 'src/systemctl/systemctl-is-active.h', - 'src/systemctl/systemctl-is-enabled.c', - 'src/systemctl/systemctl-is-enabled.h', - 'src/systemctl/systemctl-is-system-running.c', - 'src/systemctl/systemctl-is-system-running.h', - 'src/systemctl/systemctl-kill.c', - 'src/systemctl/systemctl-kill.h', - 'src/systemctl/systemctl-list-dependencies.c', - 'src/systemctl/systemctl-list-dependencies.h', - 'src/systemctl/systemctl-list-jobs.c', - 'src/systemctl/systemctl-list-jobs.h', - 'src/systemctl/systemctl-list-machines.c', - 'src/systemctl/systemctl-list-machines.h', - 'src/systemctl/systemctl-list-unit-files.c', - 'src/systemctl/systemctl-list-unit-files.h', - 'src/systemctl/systemctl-list-units.c', - 'src/systemctl/systemctl-list-units.h', - 'src/systemctl/systemctl-log-setting.c', - 'src/systemctl/systemctl-log-setting.h', - 'src/systemctl/systemctl-logind.c', - 'src/systemctl/systemctl-logind.h', - 'src/systemctl/systemctl-mount.c', - 'src/systemctl/systemctl-mount.h', - 'src/systemctl/systemctl-preset-all.c', - 'src/systemctl/systemctl-preset-all.h', - 'src/systemctl/systemctl-reset-failed.c', - 'src/systemctl/systemctl-reset-failed.h', - 'src/systemctl/systemctl-service-watchdogs.c', - 'src/systemctl/systemctl-service-watchdogs.h', - 'src/systemctl/systemctl-set-default.c', - 'src/systemctl/systemctl-set-default.h', - 'src/systemctl/systemctl-set-environment.c', - 'src/systemctl/systemctl-set-environment.h', - 'src/systemctl/systemctl-set-property.c', - 'src/systemctl/systemctl-set-property.h', - 'src/systemctl/systemctl-show.c', - 'src/systemctl/systemctl-show.h', - 'src/systemctl/systemctl-start-special.c', - 'src/systemctl/systemctl-start-special.h', - 'src/systemctl/systemctl-start-unit.c', - 'src/systemctl/systemctl-start-unit.h', - 'src/systemctl/systemctl-switch-root.c', - 'src/systemctl/systemctl-switch-root.h', - 'src/systemctl/systemctl-sysv-compat.c', - 'src/systemctl/systemctl-sysv-compat.h', - 'src/systemctl/systemctl-trivial-method.c', - 'src/systemctl/systemctl-trivial-method.h', - 'src/systemctl/systemctl-util.c', - 'src/systemctl/systemctl-util.c', - 'src/systemctl/systemctl-util.h', - 'src/systemctl/systemctl.c', - 'src/systemctl/systemctl.h', + systemctl_sources, include_directories : includes, link_with : systemctl_link_with, dependencies : [threads, diff --git a/src/systemctl/meson.build b/src/systemctl/meson.build new file mode 100644 index 0000000000..a6e254a14f --- /dev/null +++ b/src/systemctl/meson.build @@ -0,0 +1,83 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +systemctl_sources = files( + 'systemctl-add-dependency.c', + 'systemctl-add-dependency.h', + 'systemctl-cancel-job.c', + 'systemctl-cancel-job.h', + 'systemctl-clean-or-freeze.c', + 'systemctl-clean-or-freeze.h', + 'systemctl-compat-halt.c', + 'systemctl-compat-halt.h', + 'systemctl-compat-runlevel.c', + 'systemctl-compat-runlevel.h', + 'systemctl-compat-shutdown.c', + 'systemctl-compat-shutdown.h', + 'systemctl-compat-telinit.c', + 'systemctl-compat-telinit.h', + 'systemctl-daemon-reload.c', + 'systemctl-daemon-reload.h', + 'systemctl-edit.c', + 'systemctl-edit.h', + 'systemctl-enable.c', + 'systemctl-enable.h', + 'systemctl-is-active.c', + 'systemctl-is-active.h', + 'systemctl-is-enabled.c', + 'systemctl-is-enabled.h', + 'systemctl-is-system-running.c', + 'systemctl-is-system-running.h', + 'systemctl-kill.c', + 'systemctl-kill.h', + 'systemctl-list-dependencies.c', + 'systemctl-list-dependencies.h', + 'systemctl-list-jobs.c', + 'systemctl-list-jobs.h', + 'systemctl-list-machines.c', + 'systemctl-list-machines.h', + 'systemctl-list-unit-files.c', + 'systemctl-list-unit-files.h', + 'systemctl-list-units.c', + 'systemctl-list-units.h', + 'systemctl-log-setting.c', + 'systemctl-log-setting.h', + 'systemctl-logind.c', + 'systemctl-logind.h', + 'systemctl-mount.c', + 'systemctl-mount.h', + 'systemctl-preset-all.c', + 'systemctl-preset-all.h', + 'systemctl-reset-failed.c', + 'systemctl-reset-failed.h', + 'systemctl-service-watchdogs.c', + 'systemctl-service-watchdogs.h', + 'systemctl-set-default.c', + 'systemctl-set-default.h', + 'systemctl-set-environment.c', + 'systemctl-set-environment.h', + 'systemctl-set-property.c', + 'systemctl-set-property.h', + 'systemctl-show.c', + 'systemctl-show.h', + 'systemctl-start-special.c', + 'systemctl-start-special.h', + 'systemctl-start-unit.c', + 'systemctl-start-unit.h', + 'systemctl-switch-root.c', + 'systemctl-switch-root.h', + 'systemctl-sysv-compat.c', + 'systemctl-sysv-compat.h', + 'systemctl-trivial-method.c', + 'systemctl-trivial-method.h', + 'systemctl-util.c', + 'systemctl-util.h', + 'systemctl.c', + 'systemctl.h') + +if get_option('link-systemctl-shared') + systemctl_link_with = [libshared] +else + systemctl_link_with = [libsystemd_static, + libshared_static, + libbasic_gcrypt] +endif