X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=6f2b6ef96adcd8cd29a519a483b22f1b8fde1232;hp=d5eb7ad6dbc73e767cfb069eacc8308e8ecd7e0f;hb=c4d58b0b6d238b955ece39a9dd9d3ca84b3408f3;hpb=810bc2e3d594f6ed3f979b86b23c6868e17a2ad7 diff --git a/Makefile.am b/Makefile.am index d5eb7ad6d..6f2b6ef96 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,28 +32,28 @@ SUBDIRS = . po .SECONDARY: LIBUDEV_CURRENT=4 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=2 LIBUDEV_AGE=3 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=3 LIBGUDEV_AGE=1 -LIBSYSTEMD_LOGIN_CURRENT=4 +LIBSYSTEMD_LOGIN_CURRENT=5 LIBSYSTEMD_LOGIN_REVISION=0 -LIBSYSTEMD_LOGIN_AGE=4 +LIBSYSTEMD_LOGIN_AGE=5 LIBSYSTEMD_DAEMON_CURRENT=0 -LIBSYSTEMD_DAEMON_REVISION=7 +LIBSYSTEMD_DAEMON_REVISION=9 LIBSYSTEMD_DAEMON_AGE=0 LIBSYSTEMD_ID128_CURRENT=0 -LIBSYSTEMD_ID128_REVISION=17 +LIBSYSTEMD_ID128_REVISION=20 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=8 +LIBSYSTEMD_JOURNAL_CURRENT=9 LIBSYSTEMD_JOURNAL_REVISION=0 -LIBSYSTEMD_JOURNAL_AGE=8 +LIBSYSTEMD_JOURNAL_AGE=9 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -97,6 +97,7 @@ rootbindir=$(rootprefix)/bin rootlibexecdir=$(rootprefix)/lib/systemd CLEANFILES = $(BUILT_SOURCES) +DISTCLEANFILES = EXTRA_DIST = BUILT_SOURCES = INSTALL_EXEC_HOOKS = @@ -138,7 +139,7 @@ AM_CPPFLAGS = \ -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\" \ @@ -166,6 +167,7 @@ AM_CPPFLAGS = \ -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) @@ -220,7 +222,7 @@ define add-wants $(MKDIR_P) -m 0755 $$dir && \ cd $$dir && \ rm -f $$what && \ - for i in $$what; do ln -s ../$$i . || exit $$? ; done ) + for i in $$what; do $(LN_S) ../$$i . || exit $$? ; done ) endef install-directories-hook: @@ -238,7 +240,7 @@ define install-aliases $(MKDIR_P) /$(DESTDIR)$$dir && \ while [ -n "$$1" ]; do \ rm -f $(DESTDIR)$$dir/$$2 && \ - ln -s $$1 $(DESTDIR)$$dir/$$2 && \ + $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \ shift 2 || exit $$?; \ done endef @@ -355,8 +357,8 @@ dist_systemunit_DATA = \ units/initrd-root-fs.target \ units/remote-fs.target \ units/remote-fs-pre.target \ - units/remote-fs-setup.target \ units/network.target \ + units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ units/hibernate.target \ @@ -425,6 +427,7 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ + units/systemd-static-nodes.service \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -466,6 +469,7 @@ EXTRA_DIST += \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ units/user@.service.in \ + units/systemd-static-nodes.service \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -556,9 +560,10 @@ noinst_DATA += \ 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 @@ -566,11 +571,11 @@ update-man-list: make-man-rules.py $(XML_GLOB) 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 \ @@ -591,7 +596,8 @@ EXTRA_DIST += \ $(HTML_ALIAS) \ $(dist_MANS) \ make-man-index.py \ - make-directive-index.py + make-directive-index.py \ + xml_helper.py # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -674,7 +680,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/calendarspec.h \ src/shared/fileio.c \ src/shared/fileio.h \ - src/shared/output-mode.h + src/shared/output-mode.h \ + src/shared/MurmurHash3.c \ + src/shared/MurmurHash3.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -1071,6 +1079,7 @@ noinst_tests += \ test-env-replace \ test-strbuf \ test-strv \ + test-path-util \ test-strxcpyx \ test-unit-name \ test-unit-file \ @@ -1082,7 +1091,9 @@ noinst_tests += \ test-calendarspec \ test-strip-tab-ansi \ test-cgroup-util \ - test-prioq + test-prioq \ + test-fileio \ + test-time EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1182,6 +1193,24 @@ test_prioq_CFLAGS = \ test_prioq_LDADD = \ libsystemd-core.la +test_fileio_SOURCES = \ + src/test/test-fileio.c + +test_fileio_CFLAGS = \ + $(AM_CFLAGS) + +test_fileio_LDADD = \ + libsystemd-core.la + +test_time_SOURCES = \ + src/test/test-time.c + +test_time_CFLAGS = \ + $(AM_CFLAGS) + +test_time_LDADD = \ + libsystemd-core.la + test_log_SOURCES = \ src/test/test-log.c @@ -1259,6 +1288,12 @@ test_strv_LDADD = \ 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 @@ -1601,7 +1636,9 @@ systemd_stdio_bridge_SOURCES = \ src/stdio-bridge/stdio-bridge.c systemd_stdio_bridge_LDADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-daemon.la # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ @@ -1656,26 +1693,34 @@ EXTRA_DIST += \ # ------------------------------------------------------------------------------ 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-kernel.c \ + src/libsystemd-bus/bus-kernel.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 \ + src/libsystemd-bus/bus-bloom.c \ + src/libsystemd-bus/bus-bloom.h libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-daemon.la noinst_LTLIBRARIES += \ libsystemd-bus.la @@ -1683,7 +1728,10 @@ noinst_LTLIBRARIES += \ noinst_tests += \ test-bus-marshal \ test-bus-signature \ - test-bus-chat + test-bus-chat \ + test-bus-server \ + test-bus-match \ + test-bus-kernel noinst_PROGRAMS += \ busctl @@ -1721,6 +1769,40 @@ test_bus_chat_LDADD = \ 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 + +test_bus_kernel_SOURCES = \ + src/libsystemd-bus/test-bus-kernel.c + +test_bus_kernel_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_kernel_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + busctl_SOURCES = \ src/libsystemd-bus/busctl.c @@ -1863,11 +1945,13 @@ CLEANFILES += \ src/udev/udev.pc EXTRA_DIST += \ + units/systemd-static-nodes.service.in \ units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ units/systemd-udev-settle.service.in CLEANFILES += \ + units/systemd-static-nodes.service \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service @@ -1876,6 +1960,7 @@ SOCKETS_TARGET_WANTS += \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket SYSINIT_TARGET_WANTS += \ + systemd-static-nodes.service \ systemd-udevd.service \ systemd-udev-trigger.service @@ -2336,6 +2421,7 @@ dist_udevkeymap_DATA = \ keymaps/hewlett-packard-tablet \ keymaps/hewlett-packard-tx2 \ keymaps/hewlett-packard_elitebook-8440p \ + keymaps/hewlett-packard_elitebook-8460p \ keymaps/hewlett-packard-hdx9494nr \ keymaps/ibm-thinkpad-usb-keyboard-trackpoint \ keymaps/inventec-symphony_6.0_7.0 \ @@ -2427,7 +2513,8 @@ libsystemd_id128_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym libsystemd_id128_la_LIBADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-daemon-internal.la libsystemd_id128_internal_la_SOURCES = \ $(libsystemd_id128_la_SOURCES) @@ -2748,8 +2835,7 @@ UNINSTALL_DATA_HOOKS += \ catalog-remove-hook noinst_PROGRAMS += \ - test-journal-enum \ - test-catalog + test-journal-enum noinst_tests += \ test-journal \ @@ -2758,7 +2844,8 @@ noinst_tests += \ test-journal-match \ test-journal-stream \ test-journal-verify \ - test-mmap-cache + test-mmap-cache \ + test-catalog pkginclude_HEADERS += \ src/systemd/sd-journal.h \ @@ -2829,6 +2916,7 @@ systemd_journal_gatewayd_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la \ libsystemd-daemon.la \ + libsystemd-bus.la \ $(MICROHTTPD_LIBS) systemd_journal_gatewayd_CFLAGS = \ @@ -2992,7 +3080,8 @@ systemd_bootchart_SOURCES = \ src/bootchart/svg.h systemd_bootchart_LDADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-journal.la rootlibexec_PROGRAMS += \ systemd-bootchart @@ -3488,7 +3577,6 @@ pam_systemd_la_LDFLAGS = \ -export-symbols-regex '^pam_sm_.*' pam_systemd_la_LIBADD = \ - libsystemd-daemon.la \ libsystemd-audit.la \ libsystemd-dbus.la \ libsystemd-shared.la \ @@ -3685,8 +3773,7 @@ src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile 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/ @@ -3706,48 +3793,51 @@ clean-sphinx: -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,@DEBUGTTY\@,$(DEBUGTTY),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 @@ -3810,38 +3900,46 @@ CLEANFILES += \ # ------------------------------------------------------------------------------ if ENABLE_MANPAGES +man/custom-entities.ent: Makefile + $(AM_V_GEN)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)(echo '' && \ + echo '$(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 @@ -4031,6 +4129,10 @@ hwdb-update: http://standards.ieee.org/develop/regauth/iab/iab.txt && \ ./ids-update.pl ) +kdbus-update: + ( cd $(top_srcdir)/src/libsystemd-bus/ && \ + wget -N https://d-bus.googlecode.com/git/kdbus.h ) + upload: all distcheck cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/ scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/