13 files changed, 92 insertions, 40 deletions
diff --git a/src/grp-journal/.gitignore b/src/grp-journal/.gitignore
index c3fea7424f..c9bd45a7be 100644
--- a/src/grp-journal/.gitignore
+++ b/src/grp-journal/.gitignore
@@ -1 +1,5 @@
+/journald-gperf.c
+/libsystemd-journal.pc
+/audit_type-list.txt
+/audit_type-*-name.*
 /README
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index 2b4a366f8a..59ae3ee8b3 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -173,14 +173,13 @@ tests += \
 	test-compress-benchmark
 endif # HAVE_COMPRESSION
 
-ifneq ($(HAVE_SYSV_COMPAT),)
+dist_tmpfiles_DATA = \
+	tmpfiles.d/journal-nocow.conf
 
+ifneq ($(HAVE_SYSV_COMPAT),)
 varlog_DATA = \
 	docs/var-log/README
 
-$(outdir)/README: docs/var-log/README.in
-	$(SED_PROCESS)
-
 CLEANFILES += \
 	docs/var-log/README
 endif # HAVE_SYSV_COMPAT
@@ -188,6 +187,9 @@ endif # HAVE_SYSV_COMPAT
 EXTRA_DIST += \
 	docs/var-log/README.in
 
+dist_systempreset_DATA = \
+	90-journald.preset
+
 nested.subdirs += grp-remote
 nested.subdirs += journalctl
 nested.subdirs += systemd-cat
diff --git a/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile
index 2d0ec68307..b0eae79db5 100644
--- a/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile
+++ b/src/grp-journal/grp-remote/libsystemd-microhttpd/src/Makefile
@@ -23,4 +23,27 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../../config.mk
 include $(topsrcdir)/build-aux/Makefile.head.mk
 
+ifneq ($(HAVE_MICROHTTPD),)
+
+rootlibexec_LTLIBRARIES += \
+        libsystemd-microhttpd.la
+
+libsystemd_microhttpd_la_SOURCES += \
+	srjournal-remote/microhttpd-util.h \
+	srjournal-remote/microhttpd-util.c
+
+libsystemd_microhttpd_la_CFLAGS = \
+	$(MICROHTTPD_CFLAGS)
+
+libsystemd_microhttpd_la_LIBADD += \
+        libsystemd-basic.la \
+	$(MICROHTTPD_LIBS)
+
+ifneq ($(HAVE_GNUTLS),)
+libsystemd_microhttpd_la_LIBADD += \
+	$(GNUTLS_LIBS)
+endif # HAVE_GNUTLS
+
+endif # HAVE_MICROHTTPD
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
index 0ae96978af..723dfa7ac7 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
@@ -30,21 +30,12 @@ rootlibexec_PROGRAMS += \
 	systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
-	src/journal-remote/journal-gatewayd.c \
-	src/journal-remote/microhttpd-util.h \
-	src/journal-remote/microhttpd-util.c
+	src/journal-remote/journal-gatewayd.c
 
 systemd_journal_gatewayd_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
-	$(MICROHTTPD_LIBS)
-
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_gatewayd_LDADD += \
-	$(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
-systemd_journal_gatewayd_CFLAGS = \
-	$(MICROHTTPD_CFLAGS)
+	libsystemd-microhttpd.la
 
 systemd_journal_gatewayd_CPPFLAGS = \
 	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
@@ -58,6 +49,9 @@ nodist_systemunit_DATA += \
 dist_gatewayddocumentroot_DATA = \
 	src/journal-remote/browse.html
 
+dist_sysusers_DATA += \
+	sysusers.d/systemd-journal-gatewayd.conf
+
 endif # HAVE_MICROHTTPD
 
 EXTRA_DIST += \
diff --git a/src/grp-journal/grp-remote/browse.html b/src/grp-journal/grp-remote/systemd-journal-gatewayd/browse.html
index 32848c7673..32848c7673 100644
--- a/src/grp-journal/grp-remote/browse.html
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/browse.html
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index 8bb2c3871d..601bad9b5f 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -36,41 +36,27 @@ systemd_journal_remote_SOURCES = \
 	src/journal-remote/journal-remote.c
 
 systemd_journal_remote_LDADD = \
+	libsystemd-microhttpd.la \
 	libjournal-core.la
 
-systemd_journal_remote_SOURCES += \
-	src/journal-remote/microhttpd-util.h \
-	src/journal-remote/microhttpd-util.c
-
-systemd_journal_remote_CFLAGS = \
-	$(MICROHTTPD_CFLAGS)
-
-systemd_journal_remote_LDADD += \
-	$(MICROHTTPD_LIBS)
-
 ifneq ($(ENABLE_TMPFILES),)
 dist_tmpfiles_DATA += \
 	tmpfiles.d/systemd-remote.conf
 endif # ENABLE_TMPFILES
 
-ifneq ($(HAVE_GNUTLS),)
-systemd_journal_remote_LDADD += \
-	$(GNUTLS_LIBS)
-endif # HAVE_GNUTLS
-
 # systemd-journal-remote make sense mostly with full crypto stack
 dist_systemunit_DATA += \
 	units/systemd-journal-remote.socket
 
+dist_sysusers_DATA += \
+	sysusers.d/systemd-journal-remote.conf
+
 nodist_systemunit_DATA += \
 	units/systemd-journal-remote.service
 
-journal-remote-install-hook: journal-install-hook
-	-$(MKDIR_P) $(DESTDIR)/var/log/journal/remote
-	-chown 0:0 $(DESTDIR)/var/log/journal/remote
-	-chmod 755 $(DESTDIR)/var/log/journal/remote
-
-INSTALL_EXEC_HOOKS += journal-remote-install-hook
+files.sys.all += /var/log/journal/remote
+$(DESTDIR)/var/log/journal/remote:
+	$(MKDIR_P) $@
 
 nodist_pkgsysconf_DATA += \
 	src/journal-remote/journal-remote.conf
@@ -81,4 +67,7 @@ EXTRA_DIST += \
 	src/journal-remote/log-generator.py
 endif # HAVE_MICROHTTPD
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
index f6966df0f6..bc272e52da 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
@@ -45,10 +45,16 @@ nodist_systemunit_DATA += \
 nodist_pkgsysconf_DATA += \
         src/journal-remote/journal-upload.conf
 
+dist_sysusers_DATA += \
+	sysusers.d/systemd-journal-upload.conf
+
 endif # HAVE_LIBCURL
 
 EXTRA_DIST += \
         units/systemd-journal-upload.service.in \
         src/journal-remote/journal-upload.conf.in
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+sd.CPPFLAGS += -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
index c121f8f16b..f1fd95e22c 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/journal-upload.h
@@ -1,5 +1,6 @@
 #pragma once
 
+#include <curl/curl.h>
 #include <inttypes.h>
 
 #include <systemd/sd-event.h>
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index f8519405d2..880827b85d 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -30,6 +30,7 @@ journalctl_SOURCES = \
 	src/journal/journalctl.c
 
 journalctl_LDADD = \
+	libsystemd-internal.la \
 	libsystemd-shared.la \
 	libudev-core.la
 
@@ -51,11 +52,15 @@ rootbin_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-journal-flush.service \
 	units/systemd-journal-catalog-update.service
+
 SYSINIT_TARGET_WANTS += \
 	systemd-journal-flush.service \
 	systemd-journal-catalog-update.service
+
 EXTRA_DIST += \
 	units/systemd-journal-flush.service.in \
 	units/systemd-journal-catalog-update.service.in
 
+sd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/.gitignore b/src/grp-journal/libjournal-core/.gitignore
deleted file mode 100644
index b93a9462fa..0000000000
--- a/src/grp-journal/libjournal-core/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-/journald-gperf.c
-/audit_type-list.txt
-/audit_type-*-name.*
diff --git a/src/grp-journal/libjournal-core/Makefile b/src/grp-journal/libjournal-core/Makefile
new file mode 100644
index 0000000000..76e6e9ddee
--- /dev/null
+++ b/src/grp-journal/libjournal-core/Makefile
@@ -0,0 +1,28 @@
+#  -*- Mode: makefile; indent-tabs-mode: t -*-
+#
+#  This file is part of systemd.
+#
+#  Copyright 2010-2012 Lennart Poettering
+#  Copyright 2010-2012 Kay Sievers
+#  Copyright 2013 Zbigniew Jędrzejewski-Szmek
+#  Copyright 2013 David Strauss
+#  Copyright 2016 Luke Shumaker
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+#
+#  systemd is distributed in the hope that it will be useful, but
+#  WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+#  Lesser General Public License for more details.
+#
+#  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 $(topsrcdir)/build-aux/Makefile.head.mk
+
+nested.subdirs += src
+
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/libjournal-core/src/Makefile b/src/grp-journal/libjournal-core/src/Makefile
index 6ea0446e27..429c6ddbb7 100644
--- a/src/grp-journal/libjournal-core/src/Makefile
+++ b/src/grp-journal/libjournal-core/src/Makefile
@@ -53,4 +53,6 @@ libjournal_core_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libjournal-core.la
 
+sd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-journal/systemd-journald/Makefile b/src/grp-journal/systemd-journald/Makefile
index 4f05218d88..b75a248ea1 100644
--- a/src/grp-journal/systemd-journald/Makefile
+++ b/src/grp-journal/systemd-journald/Makefile
@@ -60,6 +60,7 @@ nodist_catalog_DATA = \
 
 EXTRA_DIST += \
 	$(nodist_catalog_DATA:.catalog=.catalog.in)
+EXTRA_DIST := $(EXTRA_DIST)
 
 # Note that we don't use @@ for replacement markers here, but %%. This is
 # because the catalog uses @@ already for its runtime replacement handling and