diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:09:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:09:48 -0400 |
| commit | e2582041327daab7590c369e99988ab4c827a77b (patch) | |
| tree | 6946476c40adf51bc7a9f84071a3373a89af25a0 /src/grp-resolve/systemd-resolved | |
| parent | ea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff) | |
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/grp-resolve/systemd-resolved')
5 files changed, 4 insertions, 5 deletions
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile index 8d26124091..33b53fedef 100644 --- a/src/grp-resolve/systemd-resolved/Makefile +++ b/src/grp-resolve/systemd-resolved/Makefile @@ -223,7 +223,6 @@ EXTRA_DIST += \ $(outdir)/dns-type.o: $(outdir)/dns_type-from-name.h $(outdir)/dns_type-to-name.h -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-resolve/systemd-resolved/resolve-tool.c b/src/grp-resolve/systemd-resolved/resolve-tool.c index fbf7b0e4f6..65ad9d29db 100644 --- a/src/grp-resolve/systemd-resolved/resolve-tool.c +++ b/src/grp-resolve/systemd-resolved/resolve-tool.c @@ -24,7 +24,7 @@ #include "af-list.h" #include "alloc-util.h" -#include "bus-error.h" +#include "sd-bus/bus-error.h" #include "bus-util.h" #include "escape.h" #include "in-addr-util.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-bus.c b/src/grp-resolve/systemd-resolved/resolved-bus.c index 33f7c61557..5f2c70eedf 100644 --- a/src/grp-resolve/systemd-resolved/resolved-bus.c +++ b/src/grp-resolve/systemd-resolved/resolved-bus.c @@ -18,7 +18,7 @@ ***/ #include "alloc-util.h" -#include "bus-common-errors.h" +#include "sd-bus/bus-common-errors.h" #include "bus-util.h" #include "dns-domain.h" #include "resolved-bus.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-query.c b/src/grp-resolve/systemd-resolved/resolved-dns-query.c index ea04e58d61..20dcab78ff 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-query.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-query.c @@ -21,7 +21,7 @@ #include "dns-domain.h" #include "dns-type.h" #include "hostname-util.h" -#include "local-addresses.h" +#include "sd-netlink/local-addresses.h" #include "resolved-dns-query.h" #include "resolved-dns-synthesize.h" #include "resolved-etc-hosts.h" diff --git a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c index e3003411f7..5989f049ff 100644 --- a/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c +++ b/src/grp-resolve/systemd-resolved/resolved-dns-synthesize.c @@ -19,7 +19,7 @@ #include "alloc-util.h" #include "hostname-util.h" -#include "local-addresses.h" +#include "sd-netlink/local-addresses.h" #include "resolved-dns-synthesize.h" int dns_synthesize_ifindex(int ifindex) { |