diff options
Diffstat (limited to 'src/grp-journal')
10 files changed, 24 insertions, 20 deletions
diff --git a/src/grp-journal/grp-remote/Makefile b/src/grp-journal/grp-remote/Makefile index b1415ad6d3..66e419a37e 100644 --- a/src/grp-journal/grp-remote/Makefile +++ b/src/grp-journal/grp-remote/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk nested.subdirs += systemd-journal-gatewayd diff --git a/src/grp-journal/grp-remote/microhttpd-util.c b/src/grp-journal/grp-remote/microhttpd-util.c index 99d6f32a2a..328e3b5a52 100644 --- a/src/grp-journal/grp-remote/microhttpd-util.c +++ b/src/grp-journal/grp-remote/microhttpd-util.c @@ -30,11 +30,12 @@ #include "basic/alloc-util.h" #include "basic/log.h" #include "basic/macro.h" -#include "microhttpd-util.h" #include "basic/string-util.h" #include "basic/strv.h" #include "basic/util.h" +#include "microhttpd-util.h" + void microhttpd_logger(void *arg, const char *fmt, va_list ap) { char *f; diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile index b3c2e450e5..d481db82dc 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_MICROHTTPD),) diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c index 2e21f9ecb7..76b241a14b 100644 --- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c +++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/journal-gatewayd.c @@ -32,16 +32,16 @@ #include <systemd/sd-journal.h> #include "basic/alloc-util.h" -#include "shared/bus-util.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/hostname-util.h" #include "basic/log.h" -#include "shared/logs-show.h" -#include "microhttpd-util.h" #include "basic/parse-util.h" #include "basic/sigbus.h" #include "basic/util.h" +#include "microhttpd-util.h" +#include "shared/bus-util.h" +#include "shared/logs-show.h" #define JOURNAL_WAIT_TIMEOUT (10*USEC_PER_SEC) diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile index 7a9d9b19df..45ed4abb63 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_MICROHTTPD),) diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c index 6ea7adabb0..ac1ba30310 100644 --- a/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c +++ b/src/grp-journal/grp-remote/systemd-journal-remote/journal-remote.c @@ -34,15 +34,10 @@ #include <systemd/sd-daemon.h> #include "basic/alloc-util.h" -#include "shared/conf-parser.h" #include "basic/def.h" #include "basic/escape.h" #include "basic/fd-util.h" #include "basic/fileio.h" -#include "journal-file.h" -#include "journal-remote-write.h" -#include "journal-remote.h" -#include "journald-native.h" #include "basic/macro.h" #include "basic/parse-util.h" #include "basic/signal-util.h" @@ -52,6 +47,12 @@ #include "basic/string-table.h" #include "basic/string-util.h" #include "basic/strv.h" +#include "journald-native.h" +#include "sd-journal/journal-file.h" +#include "shared/conf-parser.h" + +#include "journal-remote-write.h" +#include "journal-remote.h" #define REMOTE_JOURNAL_PATH "/var/log/journal/remote" diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile index 845a3a566d..3d90f294af 100644 --- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile +++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. -include $(dir $(lastword $(MAKEFILE_LIST)))/../../../config.mk +include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk ifneq ($(HAVE_LIBCURL),) diff --git a/src/grp-journal/libjournal-core/journald-server.c b/src/grp-journal/libjournal-core/journald-server.c index 4dca4b02b3..8bc2e55709 100644 --- a/src/grp-journal/libjournal-core/journald-server.c +++ b/src/grp-journal/libjournal-core/journald-server.c @@ -24,6 +24,7 @@ #include <sys/mman.h> #include <sys/signalfd.h> #include <sys/statvfs.h> + #include <linux/sockios.h> #include <libudev.h> diff --git a/src/grp-journal/libjournal-core/journald-stream.c b/src/grp-journal/libjournal-core/journald-stream.c index 4b0062bc9a..e90dfac1cd 100644 --- a/src/grp-journal/libjournal-core/journald-stream.c +++ b/src/grp-journal/libjournal-core/journald-stream.c @@ -33,12 +33,6 @@ #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/io-util.h" -#include "journald-console.h" -#include "journald-kmsg.h" -#include "journald-server.h" -#include "journald-stream.h" -#include "journald-syslog.h" -#include "journald-wall.h" #include "basic/mkdir.h" #include "basic/parse-util.h" #include "basic/selinux-util.h" @@ -47,6 +41,13 @@ #include "basic/string-util.h" #include "basic/syslog-util.h" +#include "journald-console.h" +#include "journald-kmsg.h" +#include "journald-server.h" +#include "journald-stream.h" +#include "journald-syslog.h" +#include "journald-wall.h" + #define STDOUT_STREAMS_MAX 4096 typedef enum StdoutStreamState { diff --git a/src/grp-journal/libjournal-core/test-compress.c b/src/grp-journal/libjournal-core/test-compress.c index 8cd098cabc..5682c28e8c 100644 --- a/src/grp-journal/libjournal-core/test-compress.c +++ b/src/grp-journal/libjournal-core/test-compress.c @@ -22,12 +22,12 @@ #endif #include "basic/alloc-util.h" -#include "compress.h" #include "basic/fd-util.h" #include "basic/fileio.h" #include "basic/macro.h" #include "basic/random-util.h" #include "basic/util.h" +#include "sd-journal/compress.h" #ifdef HAVE_XZ # define XZ_OK 0 |