summaryrefslogtreecommitdiff
path: root/src/grp-timedate
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2016-07-27 21:09:48 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2016-07-27 21:09:48 -0400
commite2582041327daab7590c369e99988ab4c827a77b (patch)
tree6946476c40adf51bc7a9f84071a3373a89af25a0 /src/grp-timedate
parentea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff)
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/grp-timedate')
-rw-r--r--src/grp-timedate/systemd-timedated/Makefile2
-rw-r--r--src/grp-timedate/systemd-timedated/timedated.c4
-rw-r--r--src/grp-timedate/timedatectl/Makefile2
-rw-r--r--src/grp-timedate/timedatectl/timedatectl.c2
4 files changed, 3 insertions, 7 deletions
diff --git a/src/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile
index 5d397e0bb0..798e3ba5a4 100644
--- a/src/grp-timedate/systemd-timedated/Makefile
+++ b/src/grp-timedate/systemd-timedated/Makefile
@@ -62,6 +62,4 @@ polkitpolicy_in_files += \
EXTRA_DIST += \
units/systemd-timedated.service.in
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
-
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-timedate/systemd-timedated/timedated.c b/src/grp-timedate/systemd-timedated/timedated.c
index 51a13fcf49..b61fce1eb8 100644
--- a/src/grp-timedate/systemd-timedated/timedated.c
+++ b/src/grp-timedate/systemd-timedated/timedated.c
@@ -26,8 +26,8 @@
#include <systemd/sd-messages.h>
#include "alloc-util.h"
-#include "bus-common-errors.h"
-#include "bus-error.h"
+#include "sd-bus/bus-common-errors.h"
+#include "sd-bus/bus-error.h"
#include "bus-util.h"
#include "clock-util.h"
#include "def.h"
diff --git a/src/grp-timedate/timedatectl/Makefile b/src/grp-timedate/timedatectl/Makefile
index 1dfb81c2f6..4394bf892b 100644
--- a/src/grp-timedate/timedatectl/Makefile
+++ b/src/grp-timedate/timedatectl/Makefile
@@ -40,6 +40,4 @@ dist_zshcompletion_data += \
shell-completion/zsh/_timedatectl
endif # ENABLE_TIMEDATED
-systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
-
include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-timedate/timedatectl/timedatectl.c b/src/grp-timedate/timedatectl/timedatectl.c
index 1fd542fb49..cea6093d97 100644
--- a/src/grp-timedate/timedatectl/timedatectl.c
+++ b/src/grp-timedate/timedatectl/timedatectl.c
@@ -25,7 +25,7 @@
#include <systemd/sd-bus.h>
-#include "bus-error.h"
+#include "sd-bus/bus-error.h"
#include "bus-util.h"
#include "pager.h"
#include "parse-util.h"