From 5e3b3f11afb6011bf543a6f4fe4de4c6074678f5 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Fri, 21 Oct 2016 15:23:37 -0400 Subject: fix --- src/grp-resolve/libbasic-dns/Makefile | 3 ++- src/systemd-reply-password/reply-password.c | 12 +++++----- src/systemd-stdio-bridge/Makefile | 1 + src/systemd-timesyncd/Makefile | 1 + src/systemd-tty-ask-password-agent/Makefile | 2 ++ src/test/test-cgroup-mask.c | 4 ++-- src/test/test-engine.c | 2 +- src/test/test-execute.c | 4 ++-- src/test/test-hostname.c | 2 +- src/test/test-job-type.c | 6 ++--- src/test/test-loopback.c | 2 +- src/test/test-namespace.c | 2 +- src/test/test-ns.c | 2 +- src/test/test-path.c | 4 ++-- src/test/test-sched-prio.c | 2 +- src/test/test-tables.c | 34 ++++++++++++++--------------- src/test/test-unit-file.c | 2 +- src/test/test-unit-name.c | 4 ++-- 18 files changed, 47 insertions(+), 42 deletions(-) diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile index 9979a2e3d6..7c64e6af5f 100644 --- a/src/grp-resolve/libbasic-dns/Makefile +++ b/src/grp-resolve/libbasic-dns/Makefile @@ -23,6 +23,7 @@ include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk -nested.subdirs += src test +nested.subdirs += src +nested.subdirs += test include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-reply-password/reply-password.c b/src/systemd-reply-password/reply-password.c index 7a5cea0e1e..febabfedf7 100644 --- a/src/systemd-reply-password/reply-password.c +++ b/src/systemd-reply-password/reply-password.c @@ -23,12 +23,12 @@ #include #include -#include "basic/fd-util.h" -#include "basic/log.h" -#include "basic/macro.h" -#include "basic/socket-util.h" -#include "basic/string-util.h" -#include "basic/util.h" +#include "systemd-basic/fd-util.h" +#include "systemd-basic/log.h" +#include "systemd-basic/macro.h" +#include "systemd-basic/socket-util.h" +#include "systemd-basic/string-util.h" +#include "systemd-basic/util.h" static int send_on_socket(int fd, const char *socket_name, const void *packet, size_t size) { union sockaddr_union sa = { diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile index 096d94b90a..cd15120b23 100644 --- a/src/systemd-stdio-bridge/Makefile +++ b/src/systemd-stdio-bridge/Makefile @@ -28,6 +28,7 @@ systemd_stdio_bridge_SOURCES = \ src/stdio-bridge/stdio-bridge.c systemd_stdio_bridge_LDADD = \ + libsystemd-internal.la \ libsystemd-shared.la include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/systemd-timesyncd/Makefile b/src/systemd-timesyncd/Makefile index 1230be959d..698dce7044 100644 --- a/src/systemd-timesyncd/Makefile +++ b/src/systemd-timesyncd/Makefile @@ -37,6 +37,7 @@ nodist_systemd_timesyncd_SOURCES = \ src/timesync/timesyncd-gperf.c systemd_timesyncd_LDADD = \ + libsystemd-internal.la \ libsystemd-network.la \ libsystemd-shared.la \ -lm diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile index 3091527a7f..beba28d912 100644 --- a/src/systemd-tty-ask-password-agent/Makefile +++ b/src/systemd-tty-ask-password-agent/Makefile @@ -30,4 +30,6 @@ systemd_tty_ask_password_agent_SOURCES = \ systemd_tty_ask_password_agent_LDADD = \ libsystemd-shared.la +sd.CPPFLAGS += -DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" + include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/test/test-cgroup-mask.c b/src/test/test-cgroup-mask.c index 28736780d3..e4db250153 100644 --- a/src/test/test-cgroup-mask.c +++ b/src/test/test-cgroup-mask.c @@ -19,11 +19,11 @@ #include -#include "manager.h" +#include "core/manager.h" +#include "core/unit.h" #include "systemd-basic/macro.h" #include "systemd-basic/rm-rf.h" #include "systemd-shared/tests.h" -#include "unit.h" #include "test-helper.h" diff --git a/src/test/test-engine.c b/src/test/test-engine.c index 73ae386b4d..7878707cbe 100644 --- a/src/test/test-engine.c +++ b/src/test/test-engine.c @@ -21,7 +21,7 @@ #include #include -#include "manager.h" +#include "core/manager.h" #include "sd-bus/bus-util.h" #include "systemd-basic/rm-rf.h" #include "systemd-shared/tests.h" diff --git a/src/test/test-execute.c b/src/test/test-execute.c index 1fe6421314..8ea0618576 100644 --- a/src/test/test-execute.c +++ b/src/test/test-execute.c @@ -23,7 +23,8 @@ #include #include -#include "manager.h" +#include "core/manager.h" +#include "core/unit.h" #include "systemd-basic/fileio.h" #include "systemd-basic/fs-util.h" #include "systemd-basic/macro.h" @@ -31,7 +32,6 @@ #include "systemd-basic/path-util.h" #include "systemd-basic/rm-rf.h" #include "systemd-basic/util.h" -#include "unit.h" #include "test-helper.h" diff --git a/src/test/test-hostname.c b/src/test/test-hostname.c index fb9a66a5d8..ffe09ae78d 100644 --- a/src/test/test-hostname.c +++ b/src/test/test-hostname.c @@ -17,7 +17,7 @@ along with systemd; If not, see . ***/ -#include "hostname-setup.h" +#include "core/hostname-setup.h" #include "systemd-basic/util.h" int main(int argc, char* argv[]) { diff --git a/src/test/test-job-type.c b/src/test/test-job-type.c index 7f0b9f253c..cfb75b12c7 100644 --- a/src/test/test-job-type.c +++ b/src/test/test-job-type.c @@ -19,9 +19,9 @@ #include -#include "job.h" -#include "service.h" -#include "unit.h" +#include "core/job.h" +#include "core/service.h" +#include "core/unit.h" int main(int argc, char*argv[]) { JobType a, b, c, ab, bc, ab_c, bc_a, a_bc; diff --git a/src/test/test-loopback.c b/src/test/test-loopback.c index bc5a5eeb2f..01b450484a 100644 --- a/src/test/test-loopback.c +++ b/src/test/test-loopback.c @@ -20,7 +20,7 @@ #include #include -#include "loopback-setup.h" +#include "core/loopback-setup.h" #include "systemd-basic/log.h" int main(int argc, char* argv[]) { diff --git a/src/test/test-namespace.c b/src/test/test-namespace.c index d1f55abd5d..cab64c980b 100644 --- a/src/test/test-namespace.c +++ b/src/test/test-namespace.c @@ -19,7 +19,7 @@ #include -#include "namespace.h" +#include "core/namespace.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/process-util.h" diff --git a/src/test/test-ns.c b/src/test/test-ns.c index 8db88155c5..151c88bc8c 100644 --- a/src/test/test-ns.c +++ b/src/test/test-ns.c @@ -20,7 +20,7 @@ #include #include -#include "namespace.h" +#include "core/namespace.h" #include "systemd-basic/log.h" int main(int argc, char *argv[]) { diff --git a/src/test/test-path.c b/src/test/test-path.c index 56f19b2d0a..b4f1547b35 100644 --- a/src/test/test-path.c +++ b/src/test/test-path.c @@ -20,7 +20,8 @@ #include #include -#include "manager.h" +#include "core/manager.h" +#include "core/unit.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/fd-util.h" #include "systemd-basic/fs-util.h" @@ -31,7 +32,6 @@ #include "systemd-basic/strv.h" #include "systemd-basic/util.h" #include "systemd-shared/tests.h" -#include "unit.h" #include "test-helper.h" diff --git a/src/test/test-sched-prio.c b/src/test/test-sched-prio.c index d903354049..f4c5864149 100644 --- a/src/test/test-sched-prio.c +++ b/src/test/test-sched-prio.c @@ -19,7 +19,7 @@ #include -#include "manager.h" +#include "core/manager.h" #include "systemd-basic/macro.h" #include "systemd-basic/rm-rf.h" #include "systemd-shared/tests.h" diff --git a/src/test/test-tables.c b/src/test/test-tables.c index 2fd3e00e82..92f9c48c27 100644 --- a/src/test/test-tables.c +++ b/src/test/test-tables.c @@ -17,23 +17,26 @@ along with systemd; If not, see . ***/ -#include "automount.h" -#include "busname.h" -#include "cgroup.h" -#include "device.h" -#include "execute.h" -#include "job.h" +#include "core/automount.h" +#include "core/busname.h" +#include "core/cgroup.h" +#include "core/device.h" +#include "core/execute.h" +#include "core/job.h" +#include "core/kill.h" +#include "core/mount.h" +#include "core/path.h" +#include "core/scope.h" +#include "core/service.h" +#include "core/slice.h" +#include "core/socket.h" +#include "core/swap.h" +#include "core/target.h" +#include "core/timer.h" +#include "core/unit.h" #include "journal-core/journald-server.h" -#include "kill.h" #include "link-config.h" -#include "mount.h" -#include "path.h" -#include "scope.h" #include "sd-journal/compress.h" -#include "service.h" -#include "slice.h" -#include "socket.h" -#include "swap.h" #include "systemd-basic/architecture.h" #include "systemd-basic/locale-util.h" #include "systemd-basic/log.h" @@ -45,9 +48,6 @@ #include "systemd-shared/install.h" #include "systemd-shared/logs-show.h" #include "systemd-shared/test-tables.h" -#include "target.h" -#include "timer.h" -#include "unit.h" int main(int argc, char **argv) { test_table(architecture, ARCHITECTURE); diff --git a/src/test/test-unit-file.c b/src/test/test-unit-file.c index b94a5f8219..3ab65865d3 100644 --- a/src/test/test-unit-file.c +++ b/src/test/test-unit-file.c @@ -25,7 +25,7 @@ #include #include -#include "load-fragment.h" +#include "core/load-fragment.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/capability-util.h" #include "systemd-basic/fd-util.h" diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c index 1bf6b35f7b..b2e833116a 100644 --- a/src/test/test-unit-name.c +++ b/src/test/test-unit-name.c @@ -24,7 +24,8 @@ #include #include -#include "manager.h" +#include "core/manager.h" +#include "core/unit.h" #include "systemd-basic/alloc-util.h" #include "systemd-basic/glob-util.h" #include "systemd-basic/hostname-util.h" @@ -36,7 +37,6 @@ #include "systemd-basic/util.h" #include "systemd-shared/specifier.h" #include "unit-printf.h" -#include "unit.h" #include "test-helper.h" -- cgit v1.2.3-54-g00ecf