diff options
| author | Lexxy Fox <lexxyfox@gmail.com> | 2023-09-26 13:30:14 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2023-10-03 16:43:39 -0500 |
| commit | cf9286d2d84f7aef237ec0d363c692ef5035aa85 (patch) | |
| tree | 7827b9bf3f477c3de0d5f225acc0818d020f0c57 | |
| parent | 9934e9f96ea91995dfab382bf05b47d43c1ac4f9 (diff) | |
Relocate pipes.c and pipes.h file to shared directory.
With the addition of logger process redirect in supervise-daemon,
pipes.c and pipes.h are now included in both s-s-d and supervise-daemon.
Thus it makes sense to move the source files to the src/shared dir.
| -rw-r--r-- | src/shared/meson.build | 4 | ||||
| -rw-r--r-- | src/shared/pipes.c (renamed from src/start-stop-daemon/pipes.c) | 0 | ||||
| -rw-r--r-- | src/shared/pipes.h (renamed from src/start-stop-daemon/pipes.h) | 0 | ||||
| -rw-r--r-- | src/start-stop-daemon/meson.build | 2 | ||||
| -rw-r--r-- | src/supervise-daemon/meson.build | 2 | ||||
| -rw-r--r-- | src/supervise-daemon/supervise-daemon.c | 2 |
6 files changed, 7 insertions, 3 deletions
diff --git a/src/shared/meson.build b/src/shared/meson.build index b80b242e..3eace88d 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -10,6 +10,10 @@ schedules_c = files([ 'schedules.c', ]) +pipes_c = files([ + 'pipes.c', + ]) + if selinux_dep.found() selinux_c = files([ 'selinux.c', diff --git a/src/start-stop-daemon/pipes.c b/src/shared/pipes.c index 5251a4f0..5251a4f0 100644 --- a/src/start-stop-daemon/pipes.c +++ b/src/shared/pipes.c diff --git a/src/start-stop-daemon/pipes.h b/src/shared/pipes.h index 861963b7..861963b7 100644 --- a/src/start-stop-daemon/pipes.h +++ b/src/shared/pipes.h diff --git a/src/start-stop-daemon/meson.build b/src/start-stop-daemon/meson.build index d363ff94..6cae791d 100644 --- a/src/start-stop-daemon/meson.build +++ b/src/start-stop-daemon/meson.build @@ -1,5 +1,5 @@ executable('start-stop-daemon', - ['start-stop-daemon.c', 'pipes.c', misc_c, schedules_c, + ['start-stop-daemon.c', pipes_c, misc_c, schedules_c, selinux_c, usage_c, version_h], c_args : [cc_audit_flags, cc_branding_flags, cc_pam_flags, cc_cap_flags, cc_selinux_flags], link_with: [libeinfo, librc], diff --git a/src/supervise-daemon/meson.build b/src/supervise-daemon/meson.build index f7d70c4c..9ef0fd86 100644 --- a/src/supervise-daemon/meson.build +++ b/src/supervise-daemon/meson.build @@ -1,5 +1,5 @@ executable('supervise-daemon', - ['supervise-daemon.c', '../start-stop-daemon/pipes.c', misc_c, plugin_c, schedules_c, usage_c, version_h], + ['supervise-daemon.c', pipes_c, misc_c, plugin_c, schedules_c, usage_c, version_h], c_args : [cc_branding_flags, cc_pam_flags, cc_cap_flags, cc_selinux_flags], link_with: [libeinfo, librc], dependencies: [dl_dep, pam_dep, cap_dep, util_dep, selinux_dep], diff --git a/src/supervise-daemon/supervise-daemon.c b/src/supervise-daemon/supervise-daemon.c index 4a0c1c49..adf35630 100644 --- a/src/supervise-daemon/supervise-daemon.c +++ b/src/supervise-daemon/supervise-daemon.c @@ -62,7 +62,7 @@ static struct pam_conv conv = { NULL, NULL}; #include "queue.h" #include "rc.h" #include "misc.h" -#include "../start-stop-daemon/pipes.h" +#include "pipes.h" #include "plugin.h" #include "schedules.h" #include "_usage.h" |