summaryrefslogtreecommitdiff
path: root/src/grp-coredump
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-coredump
parentea373df773e0e8184a4b3f8ffff3bb43f307cde9 (diff)
fix (mostly adjust #includes to have sd- prefix)
Diffstat (limited to 'src/grp-coredump')
-rw-r--r--src/grp-coredump/coredumpctl/Makefile2
-rw-r--r--src/grp-coredump/coredumpctl/coredumpctl.c4
-rw-r--r--src/grp-coredump/systemd-coredump/Makefile1
-rw-r--r--src/grp-coredump/systemd-coredump/coredump.c2
4 files changed, 3 insertions, 6 deletions
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 <systemd/sd-journal.h>
#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"