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-coredump/coredumpctl/Makefile | 2 -- src/grp-coredump/coredumpctl/coredumpctl.c | 4 ++-- src/grp-coredump/systemd-coredump/Makefile | 1 - src/grp-coredump/systemd-coredump/coredump.c | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src/grp-coredump') diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile index 4b291feb44..47a4397fa4 100644 --- a/src/grp-coredump/coredumpctl/Makefile +++ b/src/grp-coredump/coredumpctl/Makefile @@ -38,6 +38,4 @@ dist_bashcompletion_data += \ dist_zshcompletion_data += \ shell-completion/zsh/_coredumpctl -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal - include $(topsrcdir)/build-aux/Makefile.tail.mk diff --git a/src/grp-coredump/coredumpctl/coredumpctl.c b/src/grp-coredump/coredumpctl/coredumpctl.c index dc95da3613..d5bad73378 100644 --- a/src/grp-coredump/coredumpctl/coredumpctl.c +++ b/src/grp-coredump/coredumpctl/coredumpctl.c @@ -27,10 +27,10 @@ #include #include "alloc-util.h" -#include "compress.h" +#include "sd-journal/compress.h" #include "fd-util.h" #include "fileio.h" -#include "journal-internal.h" +#include "sd-journal/journal-internal.h" #include "log.h" #include "macro.h" #include "pager.h" diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile index 083a80571a..f36ccaf6cc 100644 --- a/src/grp-coredump/systemd-coredump/Makefile +++ b/src/grp-coredump/systemd-coredump/Makefile @@ -78,7 +78,6 @@ EXTRA_DIST += \ sysctl.d/50-coredump.conf.in \ units/systemd-coredump@.service.in -systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal systemd.CPPFLAGS += -I$(topsrcdir)/src/grp-journal/libjournal-core systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" diff --git a/src/grp-coredump/systemd-coredump/coredump.c b/src/grp-coredump/systemd-coredump/coredump.c index bf0e0a038b..c4690930b4 100644 --- a/src/grp-coredump/systemd-coredump/coredump.c +++ b/src/grp-coredump/systemd-coredump/coredump.c @@ -36,7 +36,7 @@ #include "alloc-util.h" #include "capability-util.h" #include "cgroup-util.h" -#include "compress.h" +#include "sd-journal/compress.h" #include "conf-parser.h" #include "copy.h" #include "coredump-vacuum.h" -- cgit v1.2.3-54-g00ecf