# keep intermediate files
.SECONDARY:
-LIBUDEV_CURRENT=3
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=2
+# Keep the test-suite.log
+.PRECIOUS: $(TEST_SUITE_LOG) Makefile
+
+LIBUDEV_CURRENT=4
+LIBUDEV_REVISION=7
+LIBUDEV_AGE=3
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=3
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=3
-LIBSYSTEMD_LOGIN_REVISION=11
-LIBSYSTEMD_LOGIN_AGE=3
+LIBSYSTEMD_LOGIN_CURRENT=8
+LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_AGE=8
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=7
+LIBSYSTEMD_DAEMON_REVISION=10
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=17
+LIBSYSTEMD_ID128_REVISION=24
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=7
+LIBSYSTEMD_JOURNAL_CURRENT=11
LIBSYSTEMD_JOURNAL_REVISION=1
-LIBSYSTEMD_JOURNAL_AGE=7
+LIBSYSTEMD_JOURNAL_AGE=11
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=@bashcompletiondir@
-rpmmacrosdir=$(sysconfdir)/rpm
+zshcompletiondir=@zshcompletiondir@
+rpmmacrosdir=$(prefix)/lib/rpm/macros.d
sysvinitdir=$(SYSTEM_SYSVINIT_PATH)
sysvrcnddir=$(SYSTEM_SYSVRCND_PATH)
varlogdir=$(localstatedir)/log
udevrulesdir=$(udevlibexecdir)/rules.d
udevhwdbdir=$(udevlibexecdir)/hwdb.d
catalogdir=$(prefix)/lib/systemd/catalog
+kernelinstalldir = $(prefix)/lib/kernel/install.d
# And these are the special ones for /
rootprefix=@rootprefix@
rootlibexecdir=$(rootprefix)/lib/systemd
CLEANFILES = $(BUILT_SOURCES)
+DISTCLEANFILES =
EXTRA_DIST =
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
INSTALL_DATA_HOOKS =
UNINSTALL_DATA_HOOKS =
DISTCLEAN_LOCAL_HOOKS =
+CLEAN_LOCAL_HOOKS =
pkginclude_HEADERS =
noinst_LTLIBRARIES =
lib_LTLIBRARIES =
include_HEADERS =
+noinst_DATA =
pkgconfiglib_DATA =
polkitpolicy_in_in_files =
polkitpolicy_in_files =
polkitpolicy_files =
dist_udevrules_DATA =
nodist_udevrules_DATA =
-dist_man_MANS =
dist_pkgsysconf_DATA =
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
check_PROGRAMS =
check_DATA =
-noinst_tests=
-noinst_PROGRAMS = $(noinst_tests)
-TESTS = $(noinst_tests)
+tests=
+manual_tests =
+if ENABLE_TESTS
+noinst_PROGRAMS = $(manual_tests) $(tests)
+TESTS = $(tests)
+else
+noinst_PROGRAMS =
+TESTS =
+endif
udevlibexec_PROGRAMS =
AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
- -DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
+ -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\" \
-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
- -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\" \
-DX_SERVER=\"$(bindir)/X\" \
-DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
+ -DQUOTACHECK=\"$(QUOTACHECK)\" \
+ -DKEXEC=\"$(KEXEC)\" \
-I $(top_srcdir)/src \
-I $(top_srcdir)/src/shared \
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev \
+ -I $(top_builddir)/src/udev \
+ -I $(top_srcdir)/src/libsystemd-bus \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
$(MKDIR_P) $(DESTDIR)$(rootlibdir) && \
so_img_name=$$(readlink $(DESTDIR)$(libdir)/$$libname) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
- ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
+ $(LN_S) -f $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/$$libname && \
mv $(DESTDIR)$(libdir)/$$libname.* $(DESTDIR)$(rootlibdir); \
fi
endef
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)
+ what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants)
define add-wants
[ -z "$$what" ] || ( \
$(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:
dir= && $(install-aliases)
define install-aliases
- $(MKDIR_P) /$(DESTDIR)$$dir && \
while [ -n "$$1" ]; do \
+ $(MKDIR_P) `dirname $(DESTDIR)$$dir/$$2` && \
rm -f $(DESTDIR)$$dir/$$2 && \
- ln -s $$1 $(DESTDIR)$$dir/$$2 && \
+ $(LN_S) $$1 $(DESTDIR)$$dir/$$2 && \
shift 2 || exit $$?; \
done
endef
AM_V_GPERF_ = $(AM_V_GPERF_$(AM_DEFAULT_VERBOSITY))
AM_V_GPERF_0 = @echo " GPERF " $@;
+AM_V_LN = $(AM_V_LN_$(V))
+AM_V_LN_ = $(AM_V_LN_$(AM_DEFAULT_VERBOSITY))
+AM_V_LN_0 = @echo " LN " $@;
+
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemctl \
systemd-notify \
systemd-ask-password \
systemd-tty-ask-password-agent \
- systemd-tmpfiles \
systemd-machine-id-setup
bin_PROGRAMS = \
systemd-nspawn \
systemd-detect-virt \
systemd-delta \
- systemd-analyze
+ systemd-analyze \
+ systemd-run
-bin_SCRIPTS = \
+dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
-EXTRA_DIST += \
- src/kernel-install/kernel-install
+dist_kernelinstall_SCRIPTS = \
+ src/kernel-install/50-depmod.install \
+ src/kernel-install/90-loaderentry.install
rootlibexec_PROGRAMS = \
systemd \
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
- systemd-timestamp \
systemd-ac-power \
systemd-sysctl \
systemd-sleep
dist_bashcompletion_DATA = \
shell-completion/bash/journalctl \
shell-completion/bash/systemctl \
- shell-completion/bash/udevadm
+ shell-completion/bash/systemd-analyze \
+ shell-completion/bash/udevadm \
+ shell-completion/bash/kernel-install
-dist_tmpfiles_DATA = \
- tmpfiles.d/systemd.conf \
- tmpfiles.d/tmp.conf \
- tmpfiles.d/x11.conf
+dist_zshcompletion_DATA = \
+ shell-completion/zsh/_systemctl \
+ shell-completion/zsh/_systemd
-if HAVE_SYSV_COMPAT
-dist_tmpfiles_DATA += \
- tmpfiles.d/legacy.conf
-endif
+dist_sysctl_DATA = \
+ sysctl.d/50-default.conf
dist_systemunit_DATA = \
units/graphical.target \
units/kexec.target \
units/local-fs.target \
units/local-fs-pre.target \
+ units/initrd.target \
+ units/initrd-fs.target \
+ units/initrd-root-fs.target \
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/slices.target \
+ units/system.slice \
+ units/x-.slice \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
units/syslog.socket \
units/sound.target \
units/bluetooth.target \
units/smartcard.target \
- units/systemd-tmpfiles-clean.timer \
- units/quotaon.service \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/systemd-udevd-control.socket \
units/systemd-udevd-kernel.socket \
units/system-update.target \
- units/initrd-parse-etc.service \
- units/initrd-cleanup.service \
- units/initrd-switch-root.target \
- units/initrd-udevadm-cleanup-db.service \
- units/initrd-switch-root.service
+ units/initrd-switch-root.target
nodist_systemunit_DATA = \
units/getty@.service \
units/systemd-initctl.service \
units/systemd-shutdownd.service \
units/systemd-remount-fs.service \
+ units/systemd-update-utmp.service \
units/systemd-update-utmp-runlevel.service \
- units/systemd-update-utmp-shutdown.service \
- units/systemd-tmpfiles-setup.service \
- units/systemd-tmpfiles-clean.service \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
- units/debug-shell.service
+ units/debug-shell.service \
+ units/initrd-parse-etc.service \
+ units/initrd-cleanup.service \
+ units/initrd-udevadm-cleanup-db.service \
+ units/initrd-switch-root.service \
+ units/systemd-nspawn@.service
dist_userunit_DATA = \
units/user/default.target \
units/systemd-initctl.service.in \
units/systemd-shutdownd.service.in \
units/systemd-remount-fs.service.in \
+ units/systemd-update-utmp.service.in \
units/systemd-update-utmp-runlevel.service.in \
- units/systemd-update-utmp-shutdown.service.in \
- units/systemd-tmpfiles-setup.service.in \
- units/systemd-tmpfiles-clean.service.in \
units/systemd-ask-password-wall.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/systemd-hybrid-sleep.service.in \
units/systemd-suspend.service.in \
units/quotaon.service.in \
- introspect.awk \
- man/custom-html.xsl
+ units/initrd-parse-etc.service.in \
+ units/initrd-cleanup.service.in \
+ units/initrd-udevadm-cleanup-db.service.in \
+ units/initrd-switch-root.service.in \
+ units/systemd-nspawn@.service.in \
+ introspect.awk
CLEANFILES += \
units/console-shell.service.m4 \
units/rc-local.service.in \
units/halt-local.service.in
+# automake is broken and can't handle files with a dash in front
+# http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14728#8
+units-install-hook:
+ mv $(DESTDIR)$(systemunitdir)/x-.slice $(DESTDIR)/$(systemunitdir)/-.slice
+
+units-uninstall-hook:
+ rm -f $(DESTDIR)/$(systemunitdir)/-.slice
+
+INSTALL_DATA_HOOKS += units-install-hook
+UNINSTALL_DATA_HOOKS += units-uninstall-hook
+
dist_doc_DATA = \
README \
NEWS \
include Makefile-man.am
+.PHONY: man
+man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS)
+
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
+HTML_FILES = \
+ ${XML_FILES:.xml=.html}
+HTML_ALIAS = \
+ ${patsubst %.1,%.html,${patsubst %.3,%.html,${patsubst %.5,%.html,${patsubst %.7,%.html,${patsubst %.8,%.html,$(MANPAGES_ALIAS)}}}}}
if ENABLE_MANPAGES
man_MANS = \
$(MANPAGES) \
$(MANPAGES_ALIAS)
-noinst_DATA = \
- ${XML_FILES:.xml=.html}
+noinst_DATA += \
+ $(HTML_FILES) \
+ $(HTML_ALIAS)
CLEANFILES += \
- $(MANPAGES) \
- $(MANPAGES_ALIAS) \
- ${XML_FILES:.xml=.html}
+ $(man_MANS) \
+ $(HTML_FILES) \
+ $(HTML_ALIAS)
+
+docs/html/man:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../../man $@
+
+noinst_DATA += \
+ docs/html/man
+
+CLEANFILES += \
+ docs/html/man
if HAVE_PYTHON
+man/index.html: man/systemd.index.html
+ $(AM_V_LN)$(LN_S) -f systemd.index.html $@
+
noinst_DATA += \
man/index.html
CLEANFILES += \
- man/index.html
-
-man/index.html:
- $(AM_V_GEN)$(LN_S) systemd.index.html $@
+ man/index.html
+XML_GLOB = $(wildcard $(top_srcdir)/man/*.xml $(top_builddir)/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 \
man/index.html \
man/systemd.directives.xml
+CLEANFILES += \
+ man/systemd.index.xml \
+ man/systemd.directives.xml
+
endif
endif
EXTRA_DIST += \
$(XML_FILES) \
- ${XML_FILES:.xml=.html} \
- $(MANPAGES) \
- $(MANPAGES_ALIAS) \
+ $(HTML_FILES) \
+ $(HTML_ALIAS) \
+ $(man_MANS) \
make-man-index.py \
- make-directive-index.py
+ make-directive-index.py \
+ xml_helper.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/shared/set.h \
src/shared/fdset.c \
src/shared/fdset.h \
+ src/shared/prioq.c \
+ src/shared/prioq.h \
+ src/shared/sleep-config.c \
+ src/shared/sleep-config.h \
src/shared/strv.c \
src/shared/strv.h \
src/shared/env-util.c \
src/shared/watchdog.h \
src/shared/spawn-ask-password-agent.c \
src/shared/spawn-ask-password-agent.h \
- src/shared/specifier.c \
- src/shared/specifier.h \
src/shared/replace-var.c \
src/shared/replace-var.h \
src/shared/spawn-polkit-agent.c \
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 \
+ src/shared/refcnt.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/shared/install-printf.c \
src/shared/install-printf.h \
src/shared/path-lookup.c \
- src/shared/path-lookup.h
+ src/shared/path-lookup.h \
+ src/shared/specifier.c \
+ src/shared/specifier.h
libsystemd_units_la_CFLAGS = \
$(AM_CFLAGS) \
src/shared/selinux-util.c \
src/shared/selinux-util.h \
src/shared/mkdir.c \
+ src/shared/mkdir-label.c \
src/shared/mkdir.h \
src/shared/ask-password-api.c \
src/shared/ask-password-api.h \
$(ACL_CFLAGS)
libsystemd_acl_la_LIBADD = \
- $(ACL_LIBS)
+ $(ACL_LIBS) \
+ libsystemd-shared.la
endif
# ------------------------------------------------------------------------------
src/core/timer.h \
src/core/path.c \
src/core/path.h \
+ src/core/slice.c \
+ src/core/slice.h \
+ src/core/scope.c \
+ src/core/scope.h \
src/core/load-dropin.c \
src/core/load-dropin.h \
src/core/execute.c \
src/core/dbus-snapshot.h \
src/core/dbus-device.c \
src/core/dbus-device.h \
+ src/core/dbus-path.c \
+ src/core/dbus-path.h \
+ src/core/dbus-slice.c \
+ src/core/dbus-slice.h \
+ src/core/dbus-scope.c \
+ src/core/dbus-scope.h \
src/core/dbus-execute.c \
src/core/dbus-execute.h \
src/core/dbus-kill.c \
src/core/dbus-kill.h \
- src/core/dbus-path.c \
- src/core/dbus-path.h \
+ src/core/dbus-cgroup.c \
+ src/core/dbus-cgroup.h \
src/core/cgroup.c \
src/core/cgroup.h \
src/core/selinux-access.c \
src/core/selinux-access.h \
src/core/selinux-setup.c \
src/core/selinux-setup.h \
+ src/core/smack-setup.c \
+ src/core/smack-setup.h \
src/core/ima-setup.c \
src/core/ima-setup.h \
src/core/locale-setup.h \
src/core/namespace.h \
src/core/tcpwrap.c \
src/core/tcpwrap.h \
- src/core/cgroup-attr.c \
- src/core/cgroup-attr.h \
- src/core/cgroup-semantics.c \
- src/core/cgroup-semantics.h \
src/core/securebits.h \
src/core/initreq.h \
src/core/special.h \
src/core/org.freedesktop.systemd1.policy.in
# ------------------------------------------------------------------------------
-noinst_PROGRAMS += \
+manual_tests += \
test-engine \
test-ns \
test-loopback \
test-watchdog \
test-log
-noinst_tests += \
+tests += \
test-job-type \
test-env-replace \
test-strbuf \
test-strv \
+ test-path-util \
test-strxcpyx \
test-unit-name \
test-unit-file \
test-sched-prio \
test-calendarspec \
test-strip-tab-ansi \
- test-cgroup-util
+ test-cgroup-util \
+ test-prioq \
+ test-fileio \
+ test-time \
+ test-hashmap \
+ test-list \
+ test-tables
EXTRA_DIST += \
test/sched_idle_bad.service \
test_ns_LDADD = \
libsystemd-core.la
+test_ns_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
test_loopback_SOURCES = \
src/test/test-loopback.c
libsystemd-core.la
if ENABLE_EFI
-noinst_PROGRAMS += \
+manual_tests += \
test-efivars
test_efivars_SOURCES = \
test_util_LDADD = \
libsystemd-core.la
+test_hashmap_SOURCES = \
+ src/test/test-hashmap.c
+
+test_hashmap_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_hashmap_LDADD = \
+ libsystemd-core.la
+
+test_list_SOURCES = \
+ src/test/test-list.c
+
+test_list_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_list_LDADD = \
+ libsystemd-core.la
+
+test_tables_SOURCES = \
+ src/test/test-tables.c \
+ src/shared/test-tables.h
+
+test_tables_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+test_tables_LDADD = \
+ libsystemd-core.la \
+ libsystemd-logs.la
+
+test_prioq_SOURCES = \
+ src/test/test-prioq.c
+
+test_prioq_CFLAGS = \
+ $(AM_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
test_strv_LDADD = \
libsystemd-shared.la \
+ 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
libsystemd-core.la \
libsystemd-daemon.la
+# ------------------------------------------------------------------------------
+## .PHONY so it always rebuilds it
+.PHONY: coverage lcov-run lcov-report
+
+# run lcov from scratch, always
+coverage:
+ $(MAKE) lcov-run
+ $(MAKE) lcov-report
+
+coverage_dir = coverage
+coverage_opts = --base-directory $(srcdir) --directory $(builddir) --rc 'geninfo_adjust_src_path=$(abspath $(srcdir))=>$(abspath $(builddir))'
+
+if ENABLE_COVERAGE
+# reset run coverage tests
+lcov-run:
+ @rm -rf $(coverage_dir)
+ lcov $(coverage_opts) --zerocounters
+ -$(MAKE) check
+
+# generate report based on current coverage data
+lcov-report:
+ $(MKDIR_P) $(coverage_dir)
+ lcov $(coverage_opts) --compat-libtool --capture --no-external \
+ | sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info
+ genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info
+ @echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html"
+
+# lcov doesn't work properly with vpath builds, make sure that bad
+# output is not uploaded by mistake.
+coverage-sync: coverage
+ test "$(builddir)" = "$(srcdir)"
+ rsync -rlv --delete --omit-dir-times coverage/ $(www_target)/coverage
+
+else
+lcov-run lcov-report:
+ echo "Need to reconfigure with --enable-coverage"
+endif
+
# ------------------------------------------------------------------------------
systemd_initctl_SOURCES = \
src/initctl/initctl.c
nodist_systemunit_DATA += \
units/systemd-modules-load.service
+
SYSINIT_TARGET_WANTS += \
systemd-modules-load.service
-dist_udevrules_DATA += \
- rules/80-drivers.rules
+if ENABLE_TMPFILES
+nodist_systemunit_DATA += \
+ units/kmod-static-nodes.service
+SYSINIT_TARGET_WANTS += \
+ kmod-static-nodes.service
+endif
endif
EXTRA_DIST += \
- units/systemd-modules-load.service.in
+ units/systemd-modules-load.service.in \
+ units/kmod-static-nodes.service.in
# ------------------------------------------------------------------------------
+if ENABLE_TMPFILES
systemd_tmpfiles_SOURCES = \
src/tmpfiles/tmpfiles.c
libsystemd-shared.la \
libsystemd-capability.la
+rootbin_PROGRAMS += \
+ systemd-tmpfiles
+
+dist_systemunit_DATA += \
+ units/systemd-tmpfiles-clean.timer
+
+nodist_systemunit_DATA += \
+ units/systemd-tmpfiles-setup-dev.service \
+ units/systemd-tmpfiles-setup.service \
+ units/systemd-tmpfiles-clean.service
+
+dist_tmpfiles_DATA = \
+ tmpfiles.d/systemd.conf \
+ tmpfiles.d/tmp.conf \
+ tmpfiles.d/x11.conf
+
+if HAVE_SYSV_COMPAT
+dist_tmpfiles_DATA += \
+ tmpfiles.d/legacy.conf
+endif
+
+SYSINIT_TARGET_WANTS += \
+ systemd-tmpfiles-setup-dev.service \
+ systemd-tmpfiles-setup.service
+
+TIMERS_TARGET_WANTS += \
+ systemd-tmpfiles-clean.timer
+
+INSTALL_DIRS += \
+ $(tmpfilesdir) \
+ $(sysconfdir)/tmpfiles.d
+endif
+
+EXTRA_DIST += \
+ units/systemd-tmpfiles-setup-dev.service.in \
+ units/systemd-tmpfiles-setup.service.in \
+ units/systemd-tmpfiles-clean.service.in
+
# ------------------------------------------------------------------------------
systemd_machine_id_setup_SOURCES = \
src/machine-id-setup/machine-id-setup-main.c \
libsystemd-dbus.la \
libudev.la
-# ------------------------------------------------------------------------------
-systemd_timestamp_SOURCES = \
- src/timestamp/timestamp.c
-
-systemd_timestamp_LDADD = \
- libsystemd-shared.la
-
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power/ac-power.c
libsystemd-label.la \
libsystemd-shared.la
-# ------------------------------------------------------------------------------
if ENABLE_EFI
+# ------------------------------------------------------------------------------
systemgenerator_PROGRAMS += \
systemd-efi-boot-generator
systemd_efi_boot_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+bootctl_SOURCES = \
+ src/boot/boot.h \
+ src/boot/boot-loader.h \
+ src/boot/bootctl.c \
+ src/boot/boot-loader.c \
+ src/boot/boot-efi.c
+
+bootctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-id128.la \
+ libsystemd-daemon.la
+
+bin_PROGRAMS += \
+ bootctl
endif
# ------------------------------------------------------------------------------
libsystemd-capability.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-id128-internal.la
+ libsystemd-id128-internal.la \
+ libsystemd-bus.la
+
+# ------------------------------------------------------------------------------
+systemd_run_SOURCES = \
+ src/run/run.c
+
+systemd_run_LDADD = \
+ libsystemd-label.la \
+ libsystemd-capability.la \
+ libsystemd-shared.la \
+ libsystemd-daemon.la \
+ libsystemd-id128-internal.la \
+ libsystemd-bus.la
# ------------------------------------------------------------------------------
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 = \
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) \
-version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym
+libsystemd_daemon_la_LIBADD = \
+ $(RT_LIBS)
+
pkginclude_HEADERS += \
src/systemd/sd-daemon.h
libsystemd-daemon.la
noinst_LTLIBRARIES += \
- libsystemd-daemon-internal.la
+ libsystemd-daemon-internal.la
pkgconfiglib_DATA += \
src/libsystemd-daemon/libsystemd-daemon.pc
src/libsystemd-daemon/libsystemd-daemon.pc.in \
src/libsystemd-daemon/libsystemd-daemon.sym
+# ------------------------------------------------------------------------------
+libsystemd_bus_la_SOURCES = \
+ src/systemd/sd-bus.h \
+ src/systemd/sd-bus-protocol.h \
+ src/systemd/sd-memfd.h \
+ src/libsystemd-bus/sd-bus.c \
+ 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-match.c \
+ src/libsystemd-bus/bus-match.h \
+ src/libsystemd-bus/bus-bloom.c \
+ src/libsystemd-bus/bus-bloom.h \
+ src/libsystemd-bus/kdbus.h \
+ src/libsystemd-bus/sd-memfd.c
+
+libsystemd_bus_la_LIBADD = \
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la \
+ libsystemd-daemon.la
+
+libsystemd_bus_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
+noinst_LTLIBRARIES += \
+ libsystemd-bus.la
+
+tests += \
+ test-bus-marshal \
+ test-bus-signature \
+ test-bus-chat \
+ test-bus-server \
+ test-bus-match \
+ test-bus-kernel \
+ test-bus-kernel-bloom \
+ test-bus-kernel-benchmark \
+ test-bus-memfd \
+ test-bus-zero-copy
+
+noinst_PROGRAMS += \
+ busctl
+
+test_bus_marshal_SOURCES = \
+ src/libsystemd-bus/test-bus-marshal.c
+
+test_bus_marshal_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ $(GLIB_LIBS) \
+ $(DBUS_LIBS)
+
+test_bus_marshal_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(GLIB_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+test_bus_signature_SOURCES = \
+ src/libsystemd-bus/test-bus-signature.c
+
+test_bus_signature_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la
+
+test_bus_chat_SOURCES = \
+ src/libsystemd-bus/test-bus-chat.c
+
+test_bus_chat_CFLAGS = \
+ $(AM_CFLAGS) \
+ -pthread
+
+test_bus_chat_LDADD = \
+ libsystemd-shared.la \
+ 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
+
+test_bus_kernel_bloom_SOURCES = \
+ src/libsystemd-bus/test-bus-kernel-bloom.c
+
+test_bus_kernel_bloom_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_kernel_bloom_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-id128-internal.la
+
+test_bus_kernel_benchmark_SOURCES = \
+ src/libsystemd-bus/test-bus-kernel-benchmark.c
+
+test_bus_kernel_benchmark_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_kernel_benchmark_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la \
+ libsystemd-id128-internal.la
+
+test_bus_memfd_SOURCES = \
+ src/libsystemd-bus/test-bus-memfd.c
+
+test_bus_memfd_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_memfd_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la
+
+test_bus_zero_copy_SOURCES = \
+ src/libsystemd-bus/test-bus-zero-copy.c
+
+test_bus_zero_copy_CFLAGS = \
+ $(AM_CFLAGS)
+
+test_bus_zero_copy_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la
+
+busctl_SOURCES = \
+ src/libsystemd-bus/busctl.c
+
+busctl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-bus.la
+
# ------------------------------------------------------------------------------
if ENABLE_GTK_DOC
SUBDIRS += \
docs/libudev
+
+noinst_DATA += \
+ docs/html/libudev \
+ docs/html/gudev
endif
include_HEADERS += \
libudev_la_LIBADD = \
libsystemd-shared.la \
+ libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la
src/libudev/libudev.sym
CLEANFILES += \
- src/libudev/libudev.pc
+ src/libudev/libudev.pc \
+ docs/html/libudev \
+ docs/html/gudev
+
+docs/html/libudev:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../libudev/html $@
+
+docs/html/gudev:
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_LN)$(LN_S) -f ../gudev/html $@
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
libudev-install-hook:
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
+ rules/60-keyboard.rules \
rules/60-persistent-storage-tape.rules \
rules/60-persistent-serial.rules \
rules/60-persistent-input.rules \
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 \
- hwdb/20-OUI.hwdb
+ hwdb/20-OUI.hwdb \
+ hwdb/60-keyboard.hwdb
udevconfdir = $(sysconfdir)/udev
dist_udevconf_DATA = \
systemd-udevd.service \
systemd-udev-trigger.service
-bin_PROGRAMS += \
+rootbin_PROGRAMS += \
udevadm
rootlibexec_PROGRAMS += \
noinst_LTLIBRARIES += \
libudev-core.la
+src/udev/keyboard-keys.txt: Makefile
+ $(AM_V_at)$(MKDIR_P) $(dir $@)
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+
+src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
+
+src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf Makefile
+ $(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
+
+src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
+
libudev_core_la_SOURCES = \
src/udev/udev.h \
src/udev/udev-event.c \
src/udev/udev-ctrl.c \
src/udev/udev-builtin.c \
src/udev/udev-builtin-btrfs.c \
- src/udev/udev-builtin-firmware.c \
src/udev/udev-builtin-hwdb.c \
src/udev/udev-builtin-input_id.c \
+ src/udev/udev-builtin-keyboard.c \
src/udev/udev-builtin-net_id.c \
src/udev/udev-builtin-path_id.c \
src/udev/udev-builtin-usb_id.c
+nodist_libudev_core_la_SOURCES = \
+ src/udev/keyboard-keys-from-name.h \
+ src/udev/keyboard-keys-to-name.h
+
+BUILT_SOURCES += \
+ $(nodist_libudev_core_la_SOURCES)
+
+CLEANFILES += \
+ src/udev/keyboard-keys-from-name.gperf \
+ src/udev/keyboard-keys.txt
+
libudev_core_la_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS) \
$(AM_CPPFLAGS) \
-DFIRMWARE_PATH="$(FIRMWARE_PATH)"
+if ENABLE_FIRMWARE
+libudev_core_la_SOURCES += \
+ src/udev/udev-builtin-firmware.c
+
+dist_udevrules_DATA += \
+ rules/50-firmware.rules
+endif
+
if HAVE_KMOD
libudev_core_la_SOURCES += \
src/udev/udev-builtin-kmod.c
+
+dist_udevrules_DATA += \
+ rules/80-drivers.rules
endif
if HAVE_BLKID
# Update hwdb on installation. Do not bother if installing
# in DESTDIR, since this is likely for packaging purposes.
hwdb-update-hook:
- -test -n "$(DESTDIR)" || $(bindir)/udevadm hwdb --update
+ -test -n "$(DESTDIR)" || $(rootbindir)/udevadm hwdb --update
INSTALL_DATA_HOOKS += \
hwdb-update-hook
test/udev-test.pl \
test/rules-test.sh
-noinst_PROGRAMS += \
+manual_tests += \
test-libudev \
test-udev
src/gudev/seed-example-enum.js \
src/gudev/seed-example.js
-# ------------------------------------------------------------------------------
-if ENABLE_KEYMAP
-keymap_SOURCES = \
- src/udev/keymap/keymap.c
-
-keymap_CPPFLAGS = \
- $(AM_CPPFLAGS) -I src/udev/keymap
-
-keymap_LDADD = \
- libsystemd-shared.la
-
-nodist_keymap_SOURCES = \
- src/udev/keymap/keys-from-name.h \
- src/udev/keymap/keys-to-name.h
-
-BUILT_SOURCES += \
- $(nodist_keymap_SOURCES)
-
-udevlibexec_PROGRAMS += \
- keymap
-
-dist_doc_DATA += \
- src/udev/keymap/README.keymap.txt
-
-dist_udevrules_DATA += \
- src/udev/keymap/95-keymap.rules \
- src/udev/keymap/95-keyboard-force-release.rules
-
-dist_udevhome_SCRIPTS = \
- src/udev/keymap/findkeyboards \
- src/udev/keymap/keyboard-force-release.sh
-
-TESTS += \
- src/udev/keymap/check-keymaps.sh
-
-CLEANFILES += \
- src/udev/keymap/keys.txt \
- src/udev/keymap/keys-from-name.gperf \
- src/udev/keymap/keyboard-force-release.sh
-
-udevkeymapdir = $(udevlibexecdir)/keymaps
-dist_udevkeymap_DATA = \
- keymaps/acer \
- keymaps/acer-aspire_5720 \
- keymaps/acer-aspire_8930 \
- keymaps/acer-aspire_5920g \
- keymaps/acer-aspire_6920 \
- keymaps/acer-travelmate_c300 \
- keymaps/asus \
- keymaps/compaq-e_evo \
- keymaps/dell \
- keymaps/dell-latitude-xt2 \
- keymaps/everex-xt5000 \
- keymaps/fujitsu-amilo_li_2732 \
- keymaps/fujitsu-amilo_pa_2548 \
- keymaps/fujitsu-amilo_pro_edition_v3505 \
- keymaps/fujitsu-amilo_pro_v3205 \
- keymaps/fujitsu-amilo_si_1520 \
- keymaps/fujitsu-esprimo_mobile_v5 \
- keymaps/fujitsu-esprimo_mobile_v6 \
- keymaps/genius-slimstar-320 \
- keymaps/hewlett-packard \
- keymaps/hewlett-packard-2510p_2530p \
- keymaps/hewlett-packard-compaq_elitebook \
- keymaps/hewlett-packard-pavilion \
- keymaps/hewlett-packard-presario-2100 \
- keymaps/hewlett-packard-tablet \
- keymaps/hewlett-packard-tx2 \
- keymaps/hewlett-packard_elitebook-8440p \
- keymaps/hewlett-packard-hdx9494nr \
- keymaps/ibm-thinkpad-usb-keyboard-trackpoint \
- keymaps/inventec-symphony_6.0_7.0 \
- keymaps/lenovo-3000 \
- keymaps/lenovo-ideapad \
- keymaps/lenovo-thinkpad-usb-keyboard-trackpoint \
- keymaps/lenovo-thinkpad_x6_tablet \
- keymaps/lenovo-thinkpad_x200_tablet \
- keymaps/lg-x110 \
- keymaps/logitech-wave \
- keymaps/logitech-wave-cordless \
- keymaps/logitech-wave-pro-cordless \
- keymaps/maxdata-pro_7000 \
- keymaps/medion-fid2060 \
- keymaps/medionnb-a555 \
- keymaps/micro-star \
- keymaps/module-asus-w3j \
- keymaps/module-ibm \
- keymaps/module-lenovo \
- keymaps/module-sony \
- keymaps/module-sony-old \
- keymaps/module-sony-vgn \
- keymaps/module-sony-vpc \
- keymaps/olpc-xo \
- keymaps/onkyo \
- keymaps/oqo-model2 \
- keymaps/samsung-other \
- keymaps/samsung-series-9 \
- keymaps/samsung-sq1us \
- keymaps/samsung-sx20s \
- keymaps/toshiba-satellite_a100 \
- keymaps/toshiba-satellite_a110 \
- keymaps/toshiba-satellite_m30x \
- keymaps/zepto-znote
-
-udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
-dist_udevkeymapforcerel_DATA = \
- keymaps-force-release/dell-touchpad \
- keymaps-force-release/dell-xps \
- keymaps-force-release/hp-other \
- keymaps-force-release/samsung-other \
- keymaps-force-release/samsung-series-9 \
- keymaps-force-release/common-volume-keys
-
-src/udev/keymap/keys.txt: Makefile
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
-
-src/udev/keymap/keys-from-name.gperf: src/udev/keymap/keys.txt Makefile
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print $$1 ", " $$1 }' < $< > $@
-
-src/udev/keymap/keys-from-name.h: src/udev/keymap/keys-from-name.gperf Makefile
- $(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_key -H hash_key_name -p -C < $< > $@
-
-src/udev/keymap/keys-to-name.h: src/udev/keymap/keys.txt Makefile
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-endif
-
-EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh \
- src/udev/keymap/keyboard-force-release.sh.in
-
# ------------------------------------------------------------------------------
mtd_probe_SOURCES = \
src/udev/mtd_probe/mtd_probe.c \
-Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym
libsystemd_id128_la_LIBADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-label.la \
+ libsystemd-daemon-internal.la
libsystemd_id128_internal_la_SOURCES = \
$(libsystemd_id128_la_SOURCES)
libsystemd-shared.la \
libsystemd-id128-internal.la
-noinst_tests += \
+tests += \
test-id128
pkginclude_HEADERS += \
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 \
libsystemd-journal-internal.la \
libsystemd-id128-internal.la
+test_journal_interleaving_SOURCES = \
+ src/journal/test-journal-interleaving.c
+
+test_journal_interleaving_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
test_mmap_cache_SOURCES = \
src/journal/test-mmap-cache.c
# "adm" and "wheel".
libsystemd-journal-install-hook:
libname=libsystemd-journal.so && $(move-to-rootlibdir)
- $(MKDIR_P) $(DESTDIR)/var/log/journal
+ -$(MKDIR_P) $(DESTDIR)/var/log/journal
-chown 0:0 $(DESTDIR)/var/log/journal
-chmod 755 $(DESTDIR)/var/log/journal
-setfacl -nm g:adm:rx,d:g:adm:rx $(DESTDIR)/var/log/journal/
UNINSTALL_DATA_HOOKS += \
catalog-remove-hook
-noinst_PROGRAMS += \
- test-journal-enum \
- test-catalog
+manual_tests += \
+ test-journal-enum
-noinst_tests += \
+tests += \
test-journal \
test-journal-send \
test-journal-syslog \
test-journal-match \
test-journal-stream \
test-journal-verify \
- test-mmap-cache
+ test-journal-interleaving \
+ 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 = \
shell-completion/bash/systemd-coredumpctl
sysctl_DATA = \
- sysctl.d/coredump.conf
+ sysctl.d/50-coredump.conf
CLEANFILES += \
- sysctl.d/coredump.conf
+ sysctl.d/50-coredump.conf
endif
EXTRA_DIST += \
- sysctl.d/coredump.conf.in
+ sysctl.d/50-coredump.conf.in
# ------------------------------------------------------------------------------
if ENABLE_BINFMT
systemd_bootchart_SOURCES = \
src/bootchart/bootchart.c \
src/bootchart/bootchart.h \
- src/bootchart/log.c \
- src/bootchart/svg.c
+ src/bootchart/store.c \
+ src/bootchart/store.h \
+ src/bootchart/svg.c \
+ src/bootchart/svg.h
systemd_bootchart_LDADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-journal.la
rootlibexec_PROGRAMS += \
systemd-bootchart
systemd-random-seed
nodist_systemunit_DATA += \
- units/systemd-random-seed-save.service \
- units/systemd-random-seed-load.service
+ units/systemd-random-seed.service
systemd_random_seed_SOURCES = \
src/random-seed/random-seed.c
libsystemd-label.la \
libsystemd-shared.la
-SHUTDOWN_TARGET_WANTS += \
- systemd-random-seed-save.service
SYSINIT_TARGET_WANTS += \
- systemd-random-seed-load.service
+ systemd-random-seed.service
endif
EXTRA_DIST += \
- units/systemd-random-seed-save.service.in \
- units/systemd-random-seed-load.service.in
+ units/systemd-random-seed.service.in
# ------------------------------------------------------------------------------
if HAVE_LIBCRYPTSETUP
EXTRA_DIST += \
units/systemd-timedated.service.in
-# ------------------------------------------------------------------------------
-if ENABLE_EFI
-bootctl_SOURCES = \
- src/boot/boot.h \
- src/boot/boot-loader.h \
- src/boot/bootctl.c \
- src/boot/boot-loader.c \
- src/boot/boot-efi.c
-
-bootctl_LDADD = \
- libsystemd-shared.la \
- libsystemd-id128.la \
- libsystemd-daemon.la
-
-bin_PROGRAMS += \
- bootctl
-endif
-
# ------------------------------------------------------------------------------
if HAVE_MYHOSTNAME
libnss_myhostname_la_SOURCES = \
libnss_myhostname.la
endif
+# ------------------------------------------------------------------------------
+if ENABLE_MACHINED
+systemd_machined_SOURCES = \
+ src/machine/machined.c \
+ src/machine/machined.h
+
+systemd_machined_CFLAGS = \
+ $(libsystemd_machine_core_la_CFLAGS)
+
+systemd_machined_LDADD = \
+ libsystemd-machine-core.la \
+ $(libsystemd_machine_core_la_LIBADD)
+
+rootlibexec_PROGRAMS += \
+ systemd-machined
+
+libsystemd_machine_core_la_SOURCES = \
+ src/machine/machined-dbus.c \
+ src/machine/machine.c \
+ src/machine/machine.h \
+ src/machine/machine-dbus.c
+
+libsystemd_machine_core_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+libsystemd_machine_core_la_LIBADD = \
+ libsystemd-label.la \
+ libsystemd-audit.la \
+ libsystemd-shared.la \
+ libsystemd-daemon.la \
+ libsystemd-dbus.la \
+ libsystemd-id128-internal.la \
+ libudev.la
+
+noinst_LTLIBRARIES += \
+ libsystemd-machine-core.la
+
+machinectl_SOURCES = \
+ src/machine/machinectl.c
+
+machinectl_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+machinectl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la \
+ libudev.la
+
+rootbin_PROGRAMS += \
+ machinectl
+
+test_machine_tables_SOURCES = \
+ src/machine/test-machine-tables.c
+
+test_machine_tables_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+test_machine_tables_LDADD = \
+ libsystemd-machine-core.la
+
+tests += \
+ test-machine-tables
+
+nodist_systemunit_DATA += \
+ units/systemd-machined.service
+
+dist_systemunit_DATA += \
+ units/machine.slice
+
+dist_dbussystemservice_DATA += \
+ src/machine/org.freedesktop.machine1.service
+
+dist_dbuspolicy_DATA += \
+ src/machine/org.freedesktop.machine1.conf
+
+SYSTEM_UNIT_ALIASES += \
+ systemd-machined.service dbus-org.freedesktop.machine1.service
+
+EXTRA_DIST += \
+ units/systemd-machined.service.in
+
+endif
+
# ------------------------------------------------------------------------------
if ENABLE_LOGIND
systemd_logind_SOURCES = \
src/login/logind.c \
- src/login/logind.h \
+ src/login/logind.h
+
+nodist_systemd_logind_SOURCES = \
+ src/login/logind-gperf.c
+
+systemd_logind_CFLAGS = \
+ $(libsystemd_logind_core_la_CFLAGS)
+
+systemd_logind_LDADD = \
+ libsystemd-logind-core.la \
+ $(libsystemd_logind_core_la_LIBADD)
+
+if HAVE_ACL
+systemd_logind_SOURCES += \
+ src/login/logind-acl.c
+
+systemd_logind_LDADD += \
+ libsystemd-acl.la
+endif
+
+libsystemd_logind_core_la_SOURCES = \
src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-device.h \
src/login/logind-user-dbus.c \
src/login/logind-acl.h
-nodist_systemd_logind_SOURCES = \
- src/login/logind-gperf.c
-
-systemd_logind_CFLAGS = \
+libsystemd_logind_core_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(DBUS_CFLAGS)
-systemd_logind_LDADD = \
+libsystemd_logind_core_la_LIBADD = \
libsystemd-label.la \
- libsystemd-shared.la \
libsystemd-audit.la \
+ libsystemd-shared.la \
libsystemd-daemon.la \
libsystemd-dbus.la \
+ libsystemd-id128-internal.la \
libudev.la
-if HAVE_ACL
-systemd_logind_SOURCES += \
- src/login/logind-acl.c
-
-systemd_logind_LDADD += \
- libsystemd-acl.la
-endif
+noinst_LTLIBRARIES += \
+ libsystemd-logind-core.la
systemd_user_sessions_SOURCES = \
src/login/user-sessions.c
dist_bashcompletion_DATA += \
shell-completion/bash/loginctl
+dist_zshcompletion_DATA += \
+ shell-completion/zsh/_loginctl
+
systemd_inhibit_SOURCES = \
src/login/inhibit.c
$(AM_CFLAGS) \
$(DBUS_CFLAGS)
-noinst_PROGRAMS += \
+test_login_tables_SOURCES = \
+ src/login/test-login-tables.c
+
+test_login_tables_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+test_login_tables_LDADD = \
+ libsystemd-logind-core.la
+
+manual_tests += \
test-login \
test-inhibit
+tests += \
+ test-login-tables
+
libsystemd_login_la_SOURCES = \
src/login/sd-login.c
-Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym
libsystemd_login_la_LIBADD = \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la
libsystemd_login_internal_la_SOURCES = \
$(libsystemd_login_la_SOURCES)
-export-symbols-regex '^pam_sm_.*'
pam_systemd_la_LIBADD = \
- libsystemd-daemon.la \
libsystemd-audit.la \
libsystemd-dbus.la \
libsystemd-shared.la \
+ libsystemd-daemon-internal.la \
$(PAM_LIBS)
pamlib_LTLIBRARIES = \
units/systemd-logind.service \
units/systemd-user-sessions.service
+dist_systemunit_DATA += \
+ units/user.slice
+
dist_dbussystemservice_DATA += \
src/login/org.freedesktop.login1.service
pkgpyexec_LTLIBRARIES = \
_journal.la \
id128.la \
- _reader.la
+ _daemon.la \
+ _reader.la \
+ login.la
_journal_la_SOURCES = \
src/python-systemd/_journal.c
_journal_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_CFLAGS)
+ -fvisibility=default \
+ $(PYTHON_DEVEL_CFLAGS)
_journal_la_LDFLAGS = \
$(AM_LDFLAGS) \
-avoid-version
_journal_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_DEVEL_LIBS) \
libsystemd-journal.la
id128_la_SOURCES = \
id128_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_CFLAGS) \
+ -fvisibility=default \
+ $(PYTHON_DEVEL_CFLAGS) \
-I$(top_builddir)/src/python-systemd
id128_la_LDFLAGS = \
-avoid-version
id128_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_DEVEL_LIBS) \
libsystemd-id128.la
+_daemon_la_SOURCES = \
+ src/python-systemd/_daemon.c \
+ src/python-systemd/pyutil.c \
+ src/python-systemd/pyutil.h
+
+_daemon_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -fvisibility=default \
+ $(PYTHON_DEVEL_CFLAGS) \
+ -I$(top_builddir)/src/python-systemd
+
+_daemon_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -shared \
+ -module \
+ -avoid-version
+
+_daemon_la_LIBADD = \
+ $(PYTHON_DEVEL_LIBS) \
+ libsystemd-daemon.la
+
_reader_la_SOURCES = \
src/python-systemd/_reader.c \
src/python-systemd/pyutil.c \
_reader_la_CFLAGS = \
$(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_CFLAGS)
+ -fvisibility=default \
+ $(PYTHON_DEVEL_CFLAGS)
_reader_la_LDFLAGS = \
$(AM_LDFLAGS) \
-avoid-version
_reader_la_LIBADD = \
- $(PYTHON_LIBS) \
+ $(PYTHON_DEVEL_LIBS) \
libsystemd-journal.la \
libsystemd-id128.la \
- libsystemd-shared.la
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la
+
+login_la_SOURCES = \
+ src/python-systemd/login.c \
+ src/python-systemd/pyutil.c \
+ src/python-systemd/pyutil.h
+
+login_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ -fvisibility=default \
+ $(PYTHON_DEVEL_CFLAGS)
+
+login_la_LDFLAGS = \
+ $(AM_LDFLAGS) \
+ -shared \
+ -module \
+ -avoid-version
+
+login_la_LIBADD = \
+ $(PYTHON_DEVEL_LIBS) \
+ libsystemd-journal.la \
+ libsystemd-login.la \
+ libsystemd-shared.la \
+ libsystemd-daemon-internal.la
dist_pkgpyexec_PYTHON = \
src/python-systemd/journal.py \
+ src/python-systemd/daemon.py \
src/python-systemd/__init__.py
src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile
BUILT_SOURCES += \
src/python-systemd/id128-constants.h
-endif
-PAPER = $(shell cat /etc/papersize 2>/dev/null || echo a4)
-SPHINXOPTS = -D latex_paper_size=$(PAPER)
+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)/man/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/man/python-systemd/
+ $(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/
+ $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
+
+python-shell:
+ $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
+ $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
destdir-sphinx: all
- dir="$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
+ 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
+
+CLEAN_LOCAL_HOOKS += clean-sphinx
+
+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)|' \
+ '|KMOD=$(KMOD)|' \
+ '|MKDIR_P=$(MKDIR_P)|' \
+ '|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
CLEANFILES += \
$(nodist_systemunit_DATA) \
$(nodist_userunit_DATA) \
- $(nodist_man_MANS) \
$(pkgconfigdata_DATA) \
$(pkgconfiglib_DATA) \
$(nodist_polkitpolicy_DATA)
# ------------------------------------------------------------------------------
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.th.extra1.suppress 1 \
--stringparam man.authors.section.enabled 0 \
- --stringparam man.copyright.section.enabled 0
+ --stringparam man.copyright.section.enabled 0 \
+ --stringparam systemd.version $(VERSION) \
+ --path '$(builddir)/man:$(srcdir)/man'
XSLTPROC_PROCESS_MAN = \
- $(AM_V_XSLT)$(MKDIR_P) $(dir $@) && \
- $(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.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/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.3: man/%.xml
+man/%.3: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.5: man/%.xml
+man/%.5: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.7: man/%.xml
+man/%.7: man/%.xml man/custom-man.xsl man/custom-entities.ent
$(XSLTPROC_PROCESS_MAN)
-man/%.8: man/%.xml
+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)
-CLEANFILES += \
- $(dist_man_MANS) \
- ${XML_FILES:.xml=.html}
+define html-alias
+ $(AM_V_LN)$(LN_S) -f $(notdir $<) $@
+endef
+
endif
+EXTRA_DIST += \
+ man/custom-html.xsl \
+ man/custom-man.xsl
+
# ------------------------------------------------------------------------------
DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h
docs/sysvinit/README.in \
docs/var-log/README.in
-EXTRA_DIST += \
- shell-completion/systemd-zsh-completion.zsh
-
SOCKETS_TARGET_WANTS += \
systemd-initctl.socket \
systemd-shutdownd.socket
RUNLEVEL5_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
endif
-SHUTDOWN_TARGET_WANTS += \
- systemd-update-utmp-shutdown.service
+SYSINIT_TARGET_WANTS += \
+ systemd-update-utmp.service
LOCAL_FS_TARGET_WANTS += \
systemd-remount-fs.service \
systemd-fsck-root.service \
sys-kernel-config.mount \
sys-kernel-debug.mount \
sys-fs-fuse-connections.mount \
- systemd-tmpfiles-setup.service \
systemd-sysctl.service \
systemd-ask-password-console.path
-BASIC_TARGET_WANTS += \
- systemd-tmpfiles-clean.timer
if HAVE_SYSV_COMPAT
SYSTEM_UNIT_ALIASES += \
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 \
endif
INSTALL_DIRS += \
- $(tmpfilesdir) \
- $(sysconfdir)/tmpfiles.d \
$(prefix)/lib/modules-load.d \
$(sysconfdir)/modules-load.d \
$(prefix)/lib/sysctl.d \
$(sysconfdir)/sysctl.d \
+ $(prefix)/lib/kernel/install.d \
+ $(sysconfdir)/kernel/install.d \
$(systemshutdowndir) \
$(systemsleepdir) \
$(systemgeneratordir) \
distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
-clean-local:
+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) \
--with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \
--with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
--with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \
+ --with-zshcompletiondir=$$dc_install_base/$(zshcompletiondir) \
--with-pamlibdir=$$dc_install_base/$(pamlibdir) \
--with-rootprefix=$$dc_install_base \
--disable-split-usr
( 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 )
+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/
www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
doc-sync: all destdir-sphinx
gtkdoc-rebase --html-dir=docs/libudev/html --online
- rsync -av --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/
+ rsync -rlv --delete docs/libudev/html/ --omit-dir-times $(www_target)/libudev/
gtkdoc-rebase --html-dir=docs/gudev/html --online
- rsync -av --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
- rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -av --delete --omit-dir-times man/python-systemd/ $(www_target)/man/python-systemd/
+ rsync -rlv --delete docs/gudev/html/ --omit-dir-times $(www_target)/gudev/
+ rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
+ rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
~ianmdlvl / elogind.git / blobdiff