aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/shared/meson.build4
-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.build2
-rw-r--r--src/supervise-daemon/meson.build2
-rw-r--r--src/supervise-daemon/supervise-daemon.c2
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"