.SECONDARY:
LIBUDEV_CURRENT=4
-LIBUDEV_REVISION=0
+LIBUDEV_REVISION=1
LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=4
-LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_REVISION=2
LIBSYSTEMD_LOGIN_AGE=4
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=7
+LIBSYSTEMD_DAEMON_REVISION=8
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=17
+LIBSYSTEMD_ID128_REVISION=19
LIBSYSTEMD_ID128_AGE=0
LIBSYSTEMD_JOURNAL_CURRENT=8
-LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_REVISION=2
LIBSYSTEMD_JOURNAL_AGE=8
# Dirs of external packages
rootlibexecdir=$(rootprefix)/lib/systemd
CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES =
EXTRA_DIST =
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
-DUSER_CONFIG_FILE=\"$(pkgsysconfdir)/user.conf\" \
-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
- -DCATALOG_PATH=\"$(catalogstatedir)\" \
+ -DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev \
+ -I $(top_srcdir)/src/libsystemd-bus \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
LOCAL_FS_TARGET_WANTS =
MULTI_USER_TARGET_WANTS =
SYSINIT_TARGET_WANTS =
-BASIC_TARGET_WANTS =
SOCKETS_TARGET_WANTS =
+TIMERS_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
USER_UNIT_ALIASES =
what="$(LOCAL_FS_TARGET_WANTS)" && wants=local-fs.target && $(add-wants)
what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants)
what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants)
- what="$(BASIC_TARGET_WANTS)" && wants=basic.target && $(add-wants)
what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants)
+ what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
units/remote-fs.target \
units/remote-fs-pre.target \
units/network.target \
+ units/network-online.target \
units/nss-lookup.target \
units/nss-user-lookup.target \
units/hibernate.target \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
+ units/timers.target \
+ units/paths.target \
units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
CLEANFILES += \
man/index.html
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml)
NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(XML_FILES))
+SOURCE_XML_FILES = $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
-XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_srcdir)/man/*.xml.in $(top_builddir)/man/*.xml)
update-man-list: make-man-rules.py $(XML_GLOB)
$(AM_V_GEN)$(PYTHON) $^ > $(top_srcdir)/Makefile-man.tmp
$(AM_V_at)mv $(top_srcdir)/Makefile-man.tmp $(top_srcdir)/Makefile-man.am
man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(PYTHON) $^ > $@
+ $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
-man/systemd.directives.xml: make-directive-index.py $(filter-out man/systemd.directives.xml,$(NON_INDEX_XML_FILES))
+man/systemd.directives.xml: make-directive-index.py $(SOURCE_XML_FILES)
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(PYTHON) $^ > $@
+ $(AM_V_GEN)$(PYTHON) $< $@ $(filter-out $<,$^)
EXTRA_DIST += \
man/systemd.index.xml \
$(HTML_ALIAS) \
$(dist_MANS) \
make-man-index.py \
- make-directive-index.py
+ make-directive-index.py \
+ xml_helper.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
- $(ACL_LIBS)
+ $(ACL_LIBS) \
+ libsystemd-shared.la
endif
# ------------------------------------------------------------------------------
test-env-replace \
test-strbuf \
test-strv \
+ test-path-util \
test-strxcpyx \
test-unit-name \
test-unit-file \
libsystemd-units.la \
libsystemd-id128-internal.la
+test_path_util_SOURCES = \
+ src/test/test-path-util.c
+
+test_path_util_LDADD = \
+ libsystemd-shared.la
+
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
src/libsystemd-daemon/sd-daemon.c
libsystemd_daemon_internal_la_SOURCES = \
- $(libsystemd_daemon_la_SOURCES)
+ $(libsystemd_daemon_la_SOURCES)
libsystemd_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd-daemon.la
noinst_LTLIBRARIES += \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la
pkgconfiglib_DATA += \
src/libsystemd-daemon/libsystemd-daemon.pc
# ------------------------------------------------------------------------------
libsystemd_bus_la_SOURCES = \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-bus-protocol.h \
src/libsystemd-bus/sd-bus.c \
- src/libsystemd-bus/sd-bus.h \
- src/libsystemd-bus/sd-bus-protocol.h \
src/libsystemd-bus/bus-control.c \
+ src/libsystemd-bus/bus-control.h \
src/libsystemd-bus/bus-error.c \
src/libsystemd-bus/bus-error.h \
src/libsystemd-bus/bus-internal.c \
src/libsystemd-bus/bus-internal.h \
+ src/libsystemd-bus/bus-socket.c \
+ src/libsystemd-bus/bus-socket.h \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
src/libsystemd-bus/bus-signature.h \
src/libsystemd-bus/bus-type.c \
- src/libsystemd-bus/bus-type.h
+ src/libsystemd-bus/bus-type.h \
+ src/libsystemd-bus/bus-match.c \
+ src/libsystemd-bus/bus-match.h
libsystemd_bus_la_LIBADD = \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la \
+ libsystemd-daemon.la
noinst_LTLIBRARIES += \
- libsystemd-bus.la
+ libsystemd-bus.la
noinst_tests += \
test-bus-marshal \
test-bus-signature \
- test-bus-chat
+ test-bus-chat \
+ test-bus-server \
+ test-bus-match
noinst_PROGRAMS += \
busctl
libsystemd-bus.la \
libsystemd-id128-internal.la
+test_bus_server_SOURCES = \
+ src/libsystemd-bus/test-bus-server.c
+
+test_bus_server_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
+test_bus_server_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-id128-internal.la
+
+test_bus_match_SOURCES = \
+ src/libsystemd-bus/test-bus-match.c
+
+test_bus_match_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_match_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-id128-internal.la
+
busctl_SOURCES = \
src/libsystemd-bus/busctl.c
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
- hwdb/20-pci-vendor-product.hwdb \
+ hwdb/20-pci-vendor-model.hwdb \
hwdb/20-pci-classes.hwdb \
- hwdb/20-usb-vendor-product.hwdb \
+ hwdb/20-usb-vendor-model.hwdb \
hwdb/20-usb-classes.hwdb \
hwdb/20-bluetooth-vendor-product.hwdb \
hwdb/20-acpi-vendor.hwdb \
libsystemd-id128-internal.la \
libsystemd-logs.la
+if HAVE_ACL
+journalctl_LDADD += \
+ libsystemd-acl.la
+endif
+
if HAVE_QRENCODE
journalctl_SOURCES += \
src/journal/journal-qrcode.c \
catalog-remove-hook
noinst_PROGRAMS += \
- test-journal-enum \
- test-catalog
+ test-journal-enum
noinst_tests += \
test-journal \
test-journal-match \
test-journal-stream \
test-journal-verify \
- test-mmap-cache
+ test-mmap-cache \
+ test-catalog
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la \
libsystemd-daemon.la \
+ libsystemd-bus.la \
$(MICROHTTPD_LIBS)
systemd_journal_gatewayd_CFLAGS = \
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS)
_journal_la_LDFLAGS = \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS) \
-I$(top_builddir)/src/python-systemd
_daemon_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS) \
-I$(top_builddir)/src/python-systemd
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
+ -fvisibility=default \
$(PYTHON_CFLAGS)
_reader_la_LDFLAGS = \
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
-PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER) -D version=$(VERSION) -D release=$(VERSION)
+SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
sphinx-%:
$(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
$(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
destdir-sphinx: all
dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
$(MAKE) DESTDIR="$$dir" install && \
- $(MAKE) DESTDIR="$$dir" sphinx-html && \
+ $(MAKE) DESTDIR="$$dir" sphinx-html && \
rm -rf "$$dir"
endif
-rm -rf docs/html/python-systemd/
# ------------------------------------------------------------------------------
+substitutions = \
+ '|rootlibexecdir=$(rootlibexecdir)|' \
+ '|rootbindir=$(rootbindir)|' \
+ '|bindir=$(bindir)|' \
+ '|SYSTEMCTL=$(rootbindir)/systemctl|' \
+ '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \
+ '|pkgsysconfdir=$(pkgsysconfdir)|' \
+ '|SYSTEM_CONFIG_UNIT_PATH=$(pkgsysconfdir)/system|' \
+ '|USER_CONFIG_UNIT_PATH=$(pkgsysconfdir)/user|' \
+ '|pkgdatadir=$(pkgdatadir)|' \
+ '|systemunitdir=$(systemunitdir)|' \
+ '|userunitdir=$(userunitdir)|' \
+ '|systempresetdir=$(systempresetdir)|' \
+ '|userpresetdir=$(userpresetdir)|' \
+ '|udevhwdbdir=$(udevhwdbdir)|' \
+ '|udevrulesdir=$(udevrulesdir)|' \
+ '|catalogdir=$(catalogdir)|' \
+ '|tmpfilesdir=$(tmpfilesdir)|' \
+ '|sysctldir=$(sysctldir)|' \
+ '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
+ '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
+ '|PACKAGE_URL=$(PACKAGE_URL)|' \
+ '|RANDOM_SEED=$(localstatedir)/lib/random-seed|' \
+ '|prefix=$(prefix)|' \
+ '|exec_prefix=$(exec_prefix)|' \
+ '|libdir=$(libdir)|' \
+ '|includedir=$(includedir)|' \
+ '|VERSION=$(VERSION)|' \
+ '|rootprefix=$(rootprefix)|' \
+ '|udevlibexecdir=$(udevlibexecdir)|' \
+ '|SUSHELL=$(SUSHELL)|' \
+ '|DEBUGTTY=$(DEBUGTTY)|' \
+ '|KILL=$(KILL)|' \
+ '|QUOTAON=$(QUOTAON)|' \
+ '|QUOTACHECK=$(QUOTACHECK)|' \
+ '|SYSTEM_SYSVINIT_PATH=$(sysvinitdir)|' \
+ '|VARLOGDIR=$(varlogdir)|' \
+ '|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
+ '|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
+ '|PYTHON=$(PYTHON)|' \
+ '|PYTHON_BINARY=$(PYTHON_BINARY)|'
+
SED_PROCESS = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
- -e 's,@rootbindir\@,$(rootbindir),g' \
- -e 's,@bindir\@,$(bindir),g' \
- -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
- -e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
- -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
- -e 's,@SYSTEM_CONFIG_UNIT_PATH\@,$(pkgsysconfdir)/system,g' \
- -e 's,@USER_CONFIG_UNIT_PATH\@,$(pkgsysconfdir)/user,g' \
- -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
- -e 's,@systemunitdir\@,$(systemunitdir),g' \
- -e 's,@userunitdir\@,$(userunitdir),g' \
- -e 's,@systempresetdir\@,$(systempresetdir),g' \
- -e 's,@userpresetdir\@,$(userpresetdir),g' \
- -e 's,@udevhwdbdir\@,$(udevhwdbdir),g' \
- -e 's,@udevrulesdir\@,$(udevrulesdir),g' \
- -e 's,@catalogdir\@,$(catalogdir),g' \
- -e 's,@tmpfilesdir\@,$(tmpfilesdir),g' \
- -e 's,@sysctldir\@,$(sysctldir),g' \
- -e 's,@PACKAGE_VERSION\@,$(PACKAGE_VERSION),g' \
- -e 's,@PACKAGE_NAME\@,$(PACKAGE_NAME),g' \
- -e 's,@PACKAGE_URL\@,$(PACKAGE_URL),g' \
- -e 's,@RANDOM_SEED\@,$(localstatedir)/lib/random-seed,g' \
- -e 's,@prefix\@,$(prefix),g' \
- -e 's,@exec_prefix\@,$(exec_prefix),g' \
- -e 's,@libdir\@,$(libdir),g' \
- -e 's,@includedir\@,$(includedir),g' \
- -e 's,@VERSION\@,$(VERSION),g' \
- -e 's,@rootprefix\@,$(rootprefix),g' \
- -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
- -e 's,@sushell\@,$(sushell),g' \
- -e 's,@KILL\@,$(KILL),g' \
- -e 's,@QUOTAON\@,$(QUOTAON),g' \
- -e 's,@QUOTACHECK\@,$(QUOTACHECK),g' \
- -e 's,@SYSTEM_SYSVINIT_PATH\@,$(sysvinitdir),g' \
- -e 's,@VARLOGDIR\@,$(varlogdir),g' \
- -e 's,@RC_LOCAL_SCRIPT_PATH_START\@,$(RC_LOCAL_SCRIPT_PATH_START),g' \
- -e 's,@RC_LOCAL_SCRIPT_PATH_STOP\@,$(RC_LOCAL_SCRIPT_PATH_STOP),g' \
- -e 's,@PYTHON\@,$(PYTHON),g' \
- -e 's,@PYTHON_BINARY\@,$(PYTHON_BINARY),g' \
+ $(SED) $(subst '|,-e 's|@,$(subst =,\@|,$(subst |',|g',$(substitutions)))) \
< $< > $@
units/%: units/%.in Makefile
# ------------------------------------------------------------------------------
if ENABLE_MANPAGES
+man/custom-entities.ent: Makefile
+ $(AM_V_GEN)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
+ echo '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">,$(substitutions))))') \
+ > $@ # '
+
+DISTCLEANFILES += \
+ man/custom-entities.ent
+
XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \
--stringparam funcsynopsis.style ansi \
--stringparam man.authors.section.enabled 0 \
--stringparam man.copyright.section.enabled 0 \
- --stringparam systemd.version $(VERSION)
+ --stringparam systemd.version $(VERSION) \
+ --path '$(builddir)/man:$(srcdir)/man'
XSLTPROC_PROCESS_MAN = \
- $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
+ $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
XSLTPROC_PROCESS_HTML = \
- $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+ $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
-man/%.1: man/%.xml man/custom-man.xsl
+man/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.3: man/%.xml man/custom-man.xsl
+man/%.3: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.5: man/%.xml man/custom-man.xsl
+man/%.5: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.7: man/%.xml man/custom-man.xsl
+man/%.7: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.8: man/%.xml man/custom-man.xsl
+man/%.8: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.html: man/%.xml man/custom-html.xsl
+man/%.html: man/%.xml man/custom-html.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_HTML)
define html-alias
systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
-BASIC_TARGET_WANTS += \
+TIMERS_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
if HAVE_SYSV_COMPAT
USER_UNIT_ALIASES += \
$(systemunitdir)/shutdown.target shutdown.target \
$(systemunitdir)/sockets.target sockets.target \
+ $(systemunitdir)/timers.target timers.target \
+ $(systemunitdir)/paths.target paths.target \
$(systemunitdir)/bluetooth.target bluetooth.target \
$(systemunitdir)/printer.target printer.target \
- $(systemunitdir)/sound.target sound.target
+ $(systemunitdir)/sound.target sound.target \
+ $(systemunitdir)/smartcard.target smartcard.target
GENERAL_ALIASES += \
$(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \
$(sysconfdir)/modules-load.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
+ $(prefix)/lib/kernel/install.d \
+ $(sysconfdir)/kernel/install.d \
$(systemshutdowndir) \
$(systemsleepdir) \
$(systemgeneratordir) \
clean-local: $(CLEAN_LOCAL_HOOKS)
rm -rf $(abs_srcdir)/install-tree
rm -f $(abs_srcdir)/hwdb/usb.ids $(abs_srcdir)/hwdb/pci.ids $(abs_srcdir)/hwdb/oui.txt \
- $(abs_srcdir)/hwdb/iab.txt
+ $(abs_srcdir)/hwdb/iab.txt
DISTCHECK_CONFIGURE_FLAGS = \
--with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
( cd $(top_srcdir)/hwdb && \
wget -N http://www.linux-usb.org/usb.ids \
http://pci-ids.ucw.cz/v2.2/pci.ids \
- http://standards.ieee.org/develop/regauth/oui/oui.txt \
+ http://standards.ieee.org/develop/regauth/oui/oui.txt \
http://standards.ieee.org/develop/regauth/iab/iab.txt && \
./ids-update.pl )