polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
-nodist_pkgsysconf_DATA =
dist_pkgsysconf_DATA =
+nodist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+ -DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
tmpfiles.d/systemd-nologin.conf \
+ tmpfiles.d/systemd-remote.conf \
tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf \
tmpfiles.d/var.conf \
CLEANFILES += $(gir_DATA) $(typelibs_DATA)
endif # HAVE_INTROSPECTION
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-hook:
- libname=libgudev-1.0.so && $(move-to-rootlibdir)
-
-libgudev-uninstall-hook:
- rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-
-INSTALL_EXEC_HOOKS += libgudev-install-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
endif
EXTRA_DIST += \
systemd-journal-remote
systemd_journal_remote_SOURCES = \
- src/journal/journal-remote-parse.h \
- src/journal/journal-remote-parse.c \
- src/journal/journal-remote-write.h \
- src/journal/journal-remote-write.c \
- src/journal/journal-remote.c
+ src/journal-remote/journal-remote-parse.h \
+ src/journal-remote/journal-remote-parse.c \
+ src/journal-remote/journal-remote-write.h \
+ src/journal-remote/journal-remote-write.c \
+ src/journal-remote/journal-remote.h \
+ src/journal-remote/journal-remote.c
systemd_journal_remote_LDADD = \
libsystemd-internal.la \
libsystemd-journal-core.la
systemd_journal_remote_SOURCES += \
- src/journal/microhttpd-util.h \
- src/journal/microhttpd-util.c
+ src/journal-remote/microhttpd-util.h \
+ src/journal-remote/microhttpd-util.c
systemd_journal_remote_CFLAGS = \
$(AM_CFLAGS) \
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
+
+# systemd-journal-remote make sense mostly with full crypto stack
+dist_systemunit_DATA += \
+ units/systemd-journal-remote.socket
+
+nodist_systemunit_DATA += \
+ units/systemd-journal-remote.service
+
+EXTRA_DIST += \
+ units/systemd-journal-remote.service.in
+
+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
+
endif
+
+nodist_pkgsysconf_DATA += \
+ src/journal-remote/journal-remote.conf
+
+EXTRA_DIST += \
+ src/journal-remote/journal-remote.conf.in
+
+CLEANFILES += \
+ src/journal-remote/journal-remote.conf
+endif
+
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+ systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+ src/journal-remote/journal-upload.h \
+ src/journal-remote/journal-upload.c \
+ src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+ libsystemd-core.la \
+ libsystemd-internal.la \
+ libsystemd-journal-internal.la \
+ libsystemd-shared.la \
+ $(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+ units/systemd-journal-upload.service
+
+EXTRA_DIST += \
+ units/systemd-journal-upload.service.in
+
+nodist_pkgsysconf_DATA += \
+ src/journal-remote/journal-upload.conf
+
+EXTRA_DIST += \
+ src/journal-remote/journal-upload.conf.in
+
+CLEANFILES += \
+ src/journal-remote/journal-upload.conf
endif
# using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
journal-uninstall-hook:
+ -rmdir $(DESTDIR)/var/log/journal/remote
-rmdir $(DESTDIR)/var/log/journal/
INSTALL_EXEC_HOOKS += journal-install-hook
systemd-journal-gatewayd
systemd_journal_gatewayd_SOURCES = \
- src/journal/journal-gatewayd.c \
- src/journal/microhttpd-util.h \
- src/journal/microhttpd-util.c
+ src/journal-remote/journal-gatewayd.c \
+ src/journal-remote/microhttpd-util.h \
+ src/journal-remote/microhttpd-util.c
systemd_journal_gatewayd_LDADD = \
libsystemd-logs.la \
units/systemd-journal-gatewayd.service
dist_gatewayddocumentroot_DATA = \
- src/journal/browse.html
+ src/journal-remote/browse.html
endif
nodist_systemunit_DATA += \
units/systemd-resolved.service
+dist_systemunit_DATA += \
+ units/org.freedesktop.resolve1.busname
+
dist_dbuspolicy_DATA += \
src/resolve/org.freedesktop.resolve1.conf
EXTRA_DIST += \
units/systemd-resolved.service.in
+SYSTEM_UNIT_ALIASES += \
+ systemd-resolved.service dbus-org.freedesktop.resolve1.service
+
+BUSNAMES_TARGET_WANTS += \
+ org.freedesktop.resolve1.busname
+
GENERAL_ALIASES += \
$(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service
'|sysctldir=$(sysctldir)|' \
'|systemgeneratordir=$(systemgeneratordir)|' \
'|usergeneratordir=$(usergeneratordir)|' \
+ '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
'|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
'|PACKAGE_NAME=$(PACKAGE_NAME)|' \
'|PACKAGE_URL=$(PACKAGE_URL)|' \
%.pc: %.pc.in
$(SED_PROCESS)
+%.conf: %.conf.in
+ $(SED_PROCESS)
+
src/core/macros.%: src/core/macros.%.in
$(SED_PROCESS)