From e2582041327daab7590c369e99988ab4c827a77b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 27 Jul 2016 21:09:48 -0400 Subject: fix (mostly adjust #includes to have sd- prefix) --- src/grp-timedate/systemd-timedated/Makefile | 2 -- src/grp-timedate/systemd-timedated/timedated.c | 4 ++-- src/grp-timedate/timedatectl/Makefile | 2 -- src/grp-timedate/timedatectl/timedatectl.c | 2 +- 4 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/grp-timedate') 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 #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 -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "pager.h" #include "parse-util.h" -- cgit v1.2.3-54-g00ecf