X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=680dd6597ef4e742c1127e6128a4b4935402ab11;hp=4806f60ec3bbee01c0981bace2806cfdb91a6dd5;hb=795607b22308f5b92073b012e43be1892fdd97c0;hpb=4caf4ac1424cf1aa328c30c5b4265da004af1a74 diff --git a/Makefile.am b/Makefile.am index 4806f60ec..680dd6597 100644 --- a/Makefile.am +++ b/Makefile.am @@ -32,16 +32,16 @@ SUBDIRS = . po .SECONDARY: LIBUDEV_CURRENT=3 -LIBUDEV_REVISION=1 +LIBUDEV_REVISION=2 LIBUDEV_AGE=2 LIBGUDEV_CURRENT=1 LIBGUDEV_REVISION=3 LIBGUDEV_AGE=1 -LIBSYSTEMD_LOGIN_CURRENT=3 -LIBSYSTEMD_LOGIN_REVISION=11 -LIBSYSTEMD_LOGIN_AGE=3 +LIBSYSTEMD_LOGIN_CURRENT=4 +LIBSYSTEMD_LOGIN_REVISION=0 +LIBSYSTEMD_LOGIN_AGE=4 LIBSYSTEMD_DAEMON_CURRENT=0 LIBSYSTEMD_DAEMON_REVISION=7 @@ -51,9 +51,9 @@ LIBSYSTEMD_ID128_CURRENT=0 LIBSYSTEMD_ID128_REVISION=17 LIBSYSTEMD_ID128_AGE=0 -LIBSYSTEMD_JOURNAL_CURRENT=7 -LIBSYSTEMD_JOURNAL_REVISION=1 -LIBSYSTEMD_JOURNAL_AGE=7 +LIBSYSTEMD_JOURNAL_CURRENT=8 +LIBSYSTEMD_JOURNAL_REVISION=0 +LIBSYSTEMD_JOURNAL_AGE=8 # Dirs of external packages dbuspolicydir=@dbuspolicydir@ @@ -64,14 +64,13 @@ pamlibdir=@pamlibdir@ pkgconfigdatadir=$(datadir)/pkgconfig pkgconfiglibdir=$(libdir)/pkgconfig polkitpolicydir=$(datadir)/polkit-1/actions -bashcompletiondir=$(sysconfdir)/bash_completion.d +bashcompletiondir=@bashcompletiondir@ rpmmacrosdir=$(sysconfdir)/rpm sysvinitdir=$(SYSTEM_SYSVINIT_PATH) sysvrcnddir=$(SYSTEM_SYSVRCND_PATH) varlogdir=$(localstatedir)/log systemdstatedir=$(localstatedir)/lib/systemd catalogstatedir=$(systemdstatedir)/catalog -hwdb_bin=/etc/udev/hwdb.bin # Our own, non-special dirs pkgsysconfdir=$(sysconfdir)/systemd @@ -105,16 +104,18 @@ UNINSTALL_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 = @@ -138,7 +139,6 @@ AM_CPPFLAGS = \ -DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \ -DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \ -DCATALOG_PATH=\"$(catalogstatedir)\" \ - -DHWDB_BIN=\"$(hwdb_bin)\" \ -DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \ -DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \ -DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \ @@ -172,7 +172,6 @@ AM_CFLAGS = $(OUR_CFLAGS) AM_LDFLAGS = $(OUR_LDFLAGS) # ------------------------------------------------------------------------------ - define move-to-rootlibdir if test "$(libdir)" != "$(rootlibdir)"; then \ $(MKDIR_P) $(DESTDIR)$(rootlibdir) && \ @@ -250,7 +249,6 @@ INSTALL_EXEC_HOOKS += \ install-aliases-hook # ------------------------------------------------------------------------------ - AM_V_M4 = $(AM_V_M4_$(V)) AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) AM_V_M4_0 = @echo " M4 " $@; @@ -263,6 +261,10 @@ AM_V_GPERF = $(AM_V_GPERF_$(V)) 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 \ @@ -278,7 +280,14 @@ bin_PROGRAMS = \ systemd-stdio-bridge \ systemd-nspawn \ systemd-detect-virt \ - systemd-delta + systemd-delta \ + systemd-analyze + +bin_SCRIPTS = \ + src/kernel-install/kernel-install + +EXTRA_DIST += \ + src/kernel-install/kernel-install rootlibexec_PROGRAMS = \ systemd \ @@ -298,20 +307,23 @@ rootlibexec_PROGRAMS = \ systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ - systemd-system-update-generator \ - systemd-efi-boot-generator + systemd-system-update-generator -dist_bin_SCRIPTS = \ - src/analyze/systemd-analyze +systemd_analyze_SOURCES = \ + src/analyze/systemd-analyze.c -EXTRA_DIST += \ - src/analyze/systemd-analyze.in +systemd_analyze_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) -CLEANFILES += \ - src/analyze/systemd-analyze +systemd_analyze_LDADD = \ + libsystemd-shared.la \ + libsystemd-dbus.la dist_bashcompletion_DATA = \ - shell-completion/systemd-bash-completion.sh + shell-completion/bash/journalctl \ + shell-completion/bash/systemctl \ + shell-completion/bash/udevadm dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ @@ -374,7 +386,8 @@ dist_systemunit_DATA = \ units/systemd-ask-password-console.path \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ - units/system-update.target + units/system-update.target \ + units/initrd-switch-root.target nodist_systemunit_DATA = \ units/getty@.service \ @@ -406,7 +419,11 @@ nodist_systemunit_DATA = \ 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 dist_userunit_DATA = \ units/user/default.target \ @@ -448,6 +465,10 @@ EXTRA_DIST += \ units/systemd-hybrid-sleep.service.in \ units/systemd-suspend.service.in \ units/quotaon.service.in \ + units/initrd-parse-etc.service.in \ + units/initrd-cleanup.service.in \ + units/initrd-udevadm-cleanup-db.service.in \ + units/initrd-switch-root.service.in \ introspect.awk \ man/custom-html.xsl @@ -480,269 +501,61 @@ dist_doc_DATA = \ @INTLTOOL_POLICY_RULE@ # ------------------------------------------------------------------------------ -MANPAGES = \ - man/systemd.1 \ - man/systemctl.1 \ - man/systemd-cgls.1 \ - man/systemd-delta.1 \ - man/systemd-cgtop.1 \ - man/systemd-nspawn.1 \ - man/systemd-tmpfiles.8 \ - man/systemd-notify.1 \ - man/systemd.unit.5 \ - man/systemd.service.5 \ - man/systemd.socket.5 \ - man/systemd.mount.5 \ - man/systemd.automount.5 \ - man/systemd.swap.5 \ - man/systemd.timer.5 \ - man/systemd.path.5 \ - man/systemd.target.5 \ - man/systemd.device.5 \ - man/systemd.snapshot.5 \ - man/systemd.exec.5 \ - man/systemd.kill.5 \ - man/systemd.special.7 \ - man/systemd.journal-fields.7 \ - man/systemd.time.7 \ - man/kernel-command-line.7 \ - man/daemon.7 \ - man/bootup.7 \ - man/runlevel.8 \ - man/telinit.8 \ - man/halt.8 \ - man/shutdown.8 \ - man/pam_systemd.8 \ - man/systemd.conf.5 \ - man/tmpfiles.d.5 \ - man/hostname.5 \ - man/localtime.5 \ - man/machine-id.5 \ - man/locale.conf.5 \ - man/os-release.5 \ - man/machine-info.5 \ - man/sysctl.d.5 \ - man/systemd-sysctl.service.8 \ - man/systemd-ask-password.1 \ - man/systemd-cat.1 \ - man/systemd-machine-id-setup.1 \ - man/systemd-detect-virt.1 \ - man/journald.conf.5 \ - man/systemd-journald.service.8 \ - man/journalctl.1 \ - man/systemd-coredumpctl.1 \ - man/systemd-inhibit.1 \ - man/systemd-remount-fs.service.8 \ - man/systemd-update-utmp-runlevel.service.8 \ - man/systemd-initctl.service.8 \ - man/systemd-shutdownd.service.8 \ - man/systemd-suspend.service.8 \ - man/systemd-halt.service.8 \ - man/systemd-fsck@.service.8 \ - man/systemd-ask-password-console.service.8 \ - man/systemd-analyze.1 \ - man/systemd-tty-ask-password-agent.1 \ - man/systemd-getty-generator.8 \ - man/systemd-system-update-generator.8 \ - man/systemd-fstab-generator.8 \ - man/systemd.preset.5 \ - man/sd-id128.3 \ - man/sd_id128_to_string.3 \ - man/sd_id128_randomize.3 \ - man/sd_id128_get_machine.3 \ - man/sd-journal.3 \ - man/sd_journal_print.3 \ - man/sd_journal_stream_fd.3 \ - man/sd_journal_open.3 \ - man/sd_journal_next.3 \ - man/sd_journal_get_data.3 \ - man/sd_journal_get_realtime_usec.3 \ - man/sd_journal_get_cutoff_realtime_usec.3 \ - man/sd_journal_get_cursor.3 \ - man/sd_journal_get_fd.3 \ - man/sd_journal_get_usage.3 \ - man/sd_journal_add_match.3 \ - man/sd_journal_seek_head.3 \ - man/sd_journal_query_unique.3 \ - man/sd_journal_get_catalog.3 - -MANPAGES_ALIAS = \ - man/reboot.8 \ - man/poweroff.8 \ - man/init.1 \ - man/systemd-sysctl.8 \ - man/systemd-journald.socket.8 \ - man/systemd-journald.8 \ - man/systemd-remount-fs.8 \ - man/systemd-update-utmp-shutdown.service.8 \ - man/systemd-update-utmp.8 \ - man/systemd-initctl.socket.8 \ - man/systemd-initctl.8 \ - man/systemd-shutdownd.socket.8 \ - man/systemd-shutdownd.8 \ - man/systemd-hibernate.service.8 \ - man/systemd-hybrid-sleep.service.8 \ - man/systemd-sleep.8 \ - man/systemd-shutdown.8 \ - man/systemd-poweroff.service.8 \ - man/systemd-reboot.service.8 \ - man/systemd-kexec.service.8 \ - man/systemd-fsck.8 \ - man/systemd-fsck-root.service.8 \ - man/systemd-ask-password-console.path.8 \ - man/systemd-ask-password-wall.service.8 \ - man/systemd-ask-password-wall.path.8 \ - man/systemd-tmpfiles-setup.service.8 \ - man/systemd-tmpfiles-clean.service.8 \ - man/systemd-tmpfiles-clean.timer.8 \ - man/sd_id128_t.3 \ - man/SD_ID128_MAKE.3 \ - man/SD_ID128_CONST_STR.3 \ - man/SD_ID128_FORMAT_STR.3 \ - man/SD_ID128_FORMAT_VAL.3 \ - man/sd_id128_equal.3 \ - man/sd_id128_from_string.3 \ - man/sd_id128_get_boot.3 \ - man/sd_journal_printv.3 \ - man/sd_journal_send.3 \ - man/sd_journal_sendv.3 \ - man/sd_journal_perror.3 \ - man/SD_JOURNAL_SUPPRESS_LOCATION.3 \ - man/sd_journal_open_directory.3 \ - man/sd_journal_close.3 \ - man/sd_journal.3 \ - man/SD_JOURNAL_RUNTIME_ONLY.3 \ - man/SD_JOURNAL_SYSTEM_ONLY.3 \ - man/SD_JOURNAL_LOCAL_ONLY.3 \ - man/sd_journal_previous.3 \ - man/sd_journal_next_skip.3 \ - man/sd_journal_previous_skip.3 \ - man/SD_JOURNAL_FOREACH.3 \ - man/SD_JOURNAL_FOREACH_BACKWARDS.3 \ - man/sd_journal_enumerate_data.3 \ - man/sd_journal_restart_data.3 \ - man/SD_JOURNAL_FOREACH_DATA.3 \ - man/sd_journal_get_monotonic_usec.3 \ - man/sd_journal_get_cutoff_monotonic_usec.3 \ - man/sd_journal_reliable_fd.3 \ - man/sd_journal_process.3 \ - man/sd_journal_wait.3 \ - man/SD_JOURNAL_NOP.3 \ - man/SD_JOURNAL_APPEND.3 \ - man/SD_JOURNAL_INVALIDATE.3 \ - man/sd_journal_add_disjunction.3 \ - man/sd_journal_flush_matches.3 \ - man/sd_journal_get_data_threshold.3 \ - man/sd_journal_set_data_threshold.3 \ - man/sd_journal_seek_tail.3 \ - man/sd_journal_seek_monotonic_usec.3 \ - man/sd_journal_seek_realtime_usec.3 \ - man/sd_journal_seek_cursor.3 \ - man/sd_journal_test_cursor.3 \ - man/sd_journal_enumerate_unique.3 \ - man/sd_journal_restart_unique.3 \ - man/SD_JOURNAL_FOREACH_UNIQUE.3 \ - man/sd_journal_get_catalog_for_message_id.3 - -man/reboot.8: man/halt.8 -man/poweroff.8: man/halt.8 -man/init.1: man/systemd.1 -man/systemd-sysctl.8: man/systemd-sysctl.service.8 -man/systemd-journald.socket.8: man/systemd-journald.service.8 -man/systemd-journald.8: man/systemd-journald.service.8 -man/systemd-remount-fs.8: man/systemd-remount-fs.service.8 -man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8 -man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8 -man/systemd-initctl.socket.8: man/systemd-initctl.service.8 -man/systemd-initctl.8: man/systemd-initctl.service.8 -man/systemd-shutdownd.socket.8: man/systemd-shutdownd.service.8 -man/systemd-shutdownd.8: man/systemd-shutdownd.service.8 -man/systemd-hibernate.service.8: man/systemd-suspend.service.8 -man/systemd-hybrid-sleep.service.8: man/systemd-suspend.service.8 -man/systemd-sleep.8: man/systemd-suspend.service.8 -man/systemd-shutdown.8: man/systemd-halt.service.8 -man/systemd-poweroff.service.8: man/systemd-halt.service.8 -man/systemd-reboot.service.8: man/systemd-halt.service.8 -man/systemd-kexec.service.8: man/systemd-halt.service.8 -man/systemd-fsck.8: man/systemd-fsck@.service.8 -man/systemd-fsck-root.service.8: man/systemd-fsck@.service.8 -man/systemd-ask-password-console.path.8: man/systemd-ask-password-console.service.8 -man/systemd-ask-password-wall.service.8: man/systemd-ask-password-console.service.8 -man/systemd-ask-password-wall.path.8: man/systemd-ask-password-console.service.8 -man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8 -man/systemd-tmpfiles-clean.service.8: man/systemd-tmpfiles.8 -man/systemd-tmpfiles-clean.timer.8: man/systemd-tmpfiles.8 -man/sd_id128_t.3: man/sd-id128.3 -man/SD_ID128_MAKE.3: man/sd-id128.3 -man/SD_ID128_CONST_STR.3: man/sd-id128.3 -man/SD_ID128_FORMAT_STR.3: man/sd-id128.3 -man/SD_ID128_FORMAT_VAL.3: man/sd-id128.3 -man/sd_id128_equal.3: man/sd-id128.3 -man/sd_id128_from_string.3: man/sd_id128_to_string.3 -man/sd_id128_get_boot.3: man/sd_id128_get_machine.3 -man/sd_journal_printv.3: man/sd_journal_print.3 -man/sd_journal_send.3: man/sd_journal_print.3 -man/sd_journal_sendv.3: man/sd_journal_print.3 -man/sd_journal_perror.3: man/sd_journal_print.3 -man/SD_JOURNAL_SUPPRESS_LOCATION.3: man/sd_journal_print.3 -man/sd_journal_open_directory.3: man/sd_journal_open.3 -man/sd_journal_close.3: man/sd_journal_open.3 -man/sd_journal.3: man/sd_journal_open.3 -man/SD_JOURNAL_RUNTIME_ONLY.3: man/sd_journal_open.3 -man/SD_JOURNAL_SYSTEM_ONLY.3: man/sd_journal_open.3 -man/SD_JOURNAL_LOCAL_ONLY.3: man/sd_journal_open.3 -man/sd_journal_previous.3: man/sd_journal_next.3 -man/sd_journal_next_skip.3: man/sd_journal_next.3 -man/sd_journal_previous_skip.3: man/sd_journal_next.3 -man/SD_JOURNAL_FOREACH.3: man/sd_journal_next.3 -man/SD_JOURNAL_FOREACH_BACKWARDS.3: man/sd_journal_next.3 -man/sd_journal_enumerate_data.3: man/sd_journal_get_data.3 -man/sd_journal_restart_data.3: man/sd_journal_get_data.3 -man/SD_JOURNAL_FOREACH_DATA.3: man/sd_journal_get_data.3 -man/sd_journal_get_monotonic_usec.3: man/sd_journal_get_realtime_usec.3 -man/sd_journal_get_cutoff_monotonic_usec.3: man/sd_journal_get_cutoff_realtime_usec.3 -man/sd_journal_reliable_fd.3: man/sd_journal_get_fd.3 -man/sd_journal_process.3: man/sd_journal_get_fd.3 -man/sd_journal_wait.3: man/sd_journal_get_fd.3 -man/SD_JOURNAL_NOP.3: man/sd_journal_get_fd.3 -man/SD_JOURNAL_APPEND.3: man/sd_journal_get_fd.3 -man/SD_JOURNAL_INVALIDATE.3: man/sd_journal_get_fd.3 -man/sd_journal_add_disjunction.3: man/sd_journal_add_match.3 -man/sd_journal_get_data_threshold.3: man/sd_journal_get_data.3 -man/sd_journal_set_data_threshold.3: man/sd_journal_get_data.3 -man/sd_journal_flush_matches.3: man/sd_journal_add_match.3 -man/sd_journal_seek_tail.3: man/sd_journal_seek_head.3 -man/sd_journal_seek_monotonic_usec.3: man/sd_journal_seek_head.3 -man/sd_journal_seek_realtime_usec.3: man/sd_journal_seek_head.3 -man/sd_journal_seek_cursor.3: man/sd_journal_seek_head.3 -man/sd_journal_test_cursor.3: man/sd_journal_get_cursor.3 -man/sd_journal_enumerate_unique.3: man/sd_journal_query_unique.3 -man/sd_journal_restart_unique.3: man/sd_journal_query_unique.3 -man/SD_JOURNAL_FOREACH_UNIQUE.3: man/sd_journal_query_unique.3 -man/sd_journal_get_catalog_for_message_id.3: man/sd_journal_get_catalog.3 + +MANPAGES = +MANPAGES_ALIAS = + +include Makefile-man.am 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 -MANPAGES += \ - man/systemd.index.7 \ - man/systemd.directives.7 +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 NON_INDEX_XML_FILES = $(filter-out man/systemd.index.xml,$(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 + @echo "Makefile-man.am has been regenerated" + man/systemd.index.xml: make-man-index.py $(NON_INDEX_XML_FILES) $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GEN)$(PYTHON) $^ > $@ @@ -752,6 +565,11 @@ man/systemd.directives.xml: make-directive-index.py $(filter-out man/systemd.dir $(AM_V_GEN)$(PYTHON) $^ > $@ EXTRA_DIST += \ + man/systemd.index.xml \ + man/index.html \ + man/systemd.directives.xml + +CLEANFILES += \ man/systemd.index.xml \ man/systemd.directives.xml @@ -761,9 +579,9 @@ endif EXTRA_DIST += \ $(XML_FILES) \ - ${XML_FILES:.xml=.html} \ - $(MANPAGES) \ - $(MANPAGES_ALIAS) \ + $(HTML_FILES) \ + $(HTML_ALIAS) \ + $(dist_MANS) \ make-man-index.py \ make-directive-index.py @@ -799,6 +617,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/fdset.h \ src/shared/strv.c \ src/shared/strv.h \ + src/shared/env-util.c \ + src/shared/env-util.h \ src/shared/strbuf.c \ src/shared/strbuf.h \ src/shared/strxcpyx.c \ @@ -844,10 +664,10 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-dst.h \ src/shared/calendarspec.c \ src/shared/calendarspec.h \ + src/shared/fileio.c \ + src/shared/fileio.h \ src/shared/output-mode.h -libsystemd_shared_la_LIBADD = libsystemd-daemon.la - #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ libsystemd-dbus.la @@ -898,6 +718,8 @@ libsystemd_label_la_SOURCES = \ src/shared/mkdir.h \ src/shared/ask-password-api.c \ src/shared/ask-password-api.h \ + src/shared/fileio-label.c \ + src/shared/fileio-label.h \ src/shared/dev-setup.c \ src/shared/dev-setup.h @@ -1048,6 +870,8 @@ libsystemd_core_la_SOURCES = \ 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 \ @@ -1068,6 +892,8 @@ libsystemd_core_la_SOURCES = \ 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 \ @@ -1081,7 +907,9 @@ libsystemd_core_la_SOURCES = \ src/core/syscall-list.c \ src/core/syscall-list.h \ src/core/audit-fd.c \ - src/core/audit-fd.h + src/core/audit-fd.h \ + src/core/sync.c \ + src/core/sync.h if HAVE_KMOD libsystemd_core_la_SOURCES += \ @@ -1101,7 +929,8 @@ libsystemd_core_la_CFLAGS = \ $(LIBWRAP_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ - $(KMOD_CFLAGS) + $(KMOD_CFLAGS) \ + -pthread libsystemd_core_la_LIBADD = \ libsystemd-capability.la \ @@ -1192,7 +1021,7 @@ dbusinterface_DATA += \ org.freedesktop.systemd1.Swap.xml \ org.freedesktop.systemd1.Path.xml -polkitpolicy_in_in_files = \ +polkitpolicy_in_in_files += \ src/core/org.freedesktop.systemd1.policy.in.in org.freedesktop.systemd1.%.xml: systemd @@ -1224,15 +1053,17 @@ noinst_PROGRAMS += \ test-cgroup \ test-install \ test-watchdog \ - test-log \ - test-efivars + test-log noinst_tests += \ test-job-type \ test-env-replace \ + test-strbuf \ test-strv \ + test-strxcpyx \ test-unit-name \ test-unit-file \ + test-util \ test-date \ test-sleep \ test-replace-var \ @@ -1290,11 +1121,16 @@ test_hostname_SOURCES = \ test_hostname_LDADD = \ libsystemd-core.la +if ENABLE_EFI +noinst_PROGRAMS += \ + test-efivars + test_efivars_SOURCES = \ src/test/test-efivars.c test_efivars_LDADD = \ libsystemd-shared.la +endif test_unit_name_SOURCES = \ src/test/test-unit-name.c @@ -1316,6 +1152,15 @@ test_unit_file_CFLAGS = \ test_unit_file_LDADD = \ libsystemd-core.la +test_util_SOURCES = \ + src/test/test-util.c + +test_util_CFLAGS = \ + $(AM_CFLAGS) + +test_util_LDADD = \ + libsystemd-core.la + test_log_SOURCES = \ src/test/test-log.c @@ -1379,6 +1224,12 @@ test_env_replace_SOURCES = \ test_env_replace_LDADD = \ libsystemd-shared.la +test_strbuf_SOURCES = \ + src/test/test-strbuf.c + +test_strbuf_LDADD = \ + libsystemd-shared.la + test_strv_SOURCES = \ src/test/test-strv.c @@ -1386,6 +1237,12 @@ test_strv_LDADD = \ libsystemd-shared.la \ libsystemd-id128-internal.la +test_strxcpyx_SOURCES = \ + src/test/test-strxcpyx.c + +test_strxcpyx_LDADD = \ + libsystemd-shared.la + test_install_SOURCES = \ src/test/test-install.c @@ -1495,12 +1352,6 @@ SYSINIT_TARGET_WANTS += \ dist_udevrules_DATA += \ rules/80-drivers.rules -MANPAGES += \ - man/modules-load.d.5 \ - man/systemd-modules-load.service.8 -MANPAGES_ALIAS += \ - man/systemd-modules-load.8 -man/systemd-modules-load.8: man/systemd-modules-load.service.8 endif EXTRA_DIST += \ @@ -1614,12 +1465,17 @@ systemd_system_update_generator_LDADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ +if ENABLE_EFI +systemgenerator_PROGRAMS += \ + systemd-efi-boot-generator + systemd_efi_boot_generator_SOURCES = \ src/efi-boot-generator/efi-boot-generator.c systemd_efi_boot_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +endif # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ @@ -1739,6 +1595,9 @@ systemd_tty_ask_password_agent_LDADD = \ libsystemd_daemon_la_SOURCES = \ src/libsystemd-daemon/sd-daemon.c +libsystemd_daemon_internal_la_SOURCES = \ + $(libsystemd_daemon_la_SOURCES) + libsystemd_daemon_la_CFLAGS = \ $(AM_CFLAGS) \ -fvisibility=hidden \ @@ -1746,7 +1605,6 @@ libsystemd_daemon_la_CFLAGS = \ libsystemd_daemon_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -shared \ -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-daemon/libsystemd-daemon.sym @@ -1766,47 +1624,12 @@ UNINSTALL_EXEC_HOOKS += libsystemd-daemon-uninstall-hook lib_LTLIBRARIES += \ libsystemd-daemon.la +noinst_LTLIBRARIES += \ + libsystemd-daemon-internal.la + pkgconfiglib_DATA += \ src/libsystemd-daemon/libsystemd-daemon.pc -MANPAGES += \ - man/sd-daemon.3 \ - man/sd_notify.3 \ - man/sd_listen_fds.3 \ - man/sd_is_fifo.3 \ - man/sd_booted.3 - -MANPAGES_ALIAS += \ - man/sd_is_socket.3 \ - man/sd_is_socket_unix.3 \ - man/sd_is_socket_inet.3 \ - man/sd_is_mq.3 \ - man/sd_notifyf.3 \ - man/SD_LISTEN_FDS_START.3 \ - man/SD_EMERG.3 \ - man/SD_ALERT.3 \ - man/SD_CRIT.3 \ - man/SD_ERR.3 \ - man/SD_WARNING.3 \ - man/SD_NOTICE.3 \ - man/SD_INFO.3 \ - man/SD_DEBUG.3 - -man/sd_is_socket.3: man/sd_is_fifo.3 -man/sd_is_socket_unix.3: man/sd_is_fifo.3 -man/sd_is_socket_inet.3: man/sd_is_fifo.3 -man/sd_is_mq.3: man/sd_is_fifo.3 -man/sd_notifyf.3: man/sd_notify.3 -man/SD_LISTEN_FDS_START.3: man/sd_listen_fds.3 -man/SD_EMERG.3: man/sd-daemon.3 -man/SD_ALERT.3: man/sd-daemon.3 -man/SD_CRIT.3: man/sd-daemon.3 -man/SD_ERR.3: man/sd-daemon.3 -man/SD_WARNING.3: man/sd-daemon.3 -man/SD_NOTICE.3: man/sd-daemon.3 -man/SD_INFO.3: man/sd-daemon.3 -man/SD_DEBUG.3: man/sd-daemon.3 - EXTRA_DIST += \ src/libsystemd-daemon/libsystemd-daemon.pc.in \ src/libsystemd-daemon/libsystemd-daemon.sym @@ -1815,6 +1638,10 @@ EXTRA_DIST += \ if ENABLE_GTK_DOC SUBDIRS += \ docs/libudev + +noinst_DATA += \ + docs/html/libudev \ + docs/html/gudev endif include_HEADERS += \ @@ -1845,7 +1672,9 @@ libudev_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym libudev_la_LIBADD = \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-daemon-internal.la \ + libsystemd-id128-internal.la pkgconfiglib_DATA += \ src/libudev/libudev.pc @@ -1855,7 +1684,17 @@ EXTRA_DIST += \ 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: @@ -1884,25 +1723,9 @@ libudev_private_la_LIBADD = \ libsystemd-shared.la # ------------------------------------------------------------------------------ -MANPAGES += \ - man/udev.7 \ - man/udevadm.8 \ - man/systemd-udevd.service.8 - -MANPAGES_ALIAS += \ - man/systemd-udevd.8 \ - man/systemd-udevd-control.socket.8 \ - man/systemd-udevd-kernel.socket.8 - -man/systemd-udevd.8: man/systemd-udevd.service.8 -man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8 -man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8 - -udev-confdirs: - -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/rules.d - -$(MKDIR_P) $(DESTDIR)$(sysconfdir)/udev/hwdb.d - -INSTALL_DATA_HOOKS += udev-confdirs +INSTALL_DIRS += \ + $(sysconfdir)/udev/rules.d \ + $(sysconfdir)/udev/hwdb.d dist_udevrules_DATA += \ rules/99-systemd.rules \ @@ -1962,7 +1785,7 @@ SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ systemd-udev-trigger.service -bin_PROGRAMS += \ +rootbin_PROGRAMS += \ udevadm rootlibexec_PROGRAMS += \ @@ -1985,8 +1808,7 @@ libudev_core_la_SOURCES = \ src/udev/udev-builtin-input_id.c \ src/udev/udev-builtin-net_id.c \ src/udev/udev-builtin-path_id.c \ - src/udev/udev-builtin-usb_id.c \ - src/libsystemd-daemon/sd-daemon.c + src/udev/udev-builtin-usb_id.c libudev_core_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -1996,6 +1818,7 @@ libudev_core_la_CFLAGS = \ libudev_core_la_LIBADD = \ libudev-private.la \ libsystemd-label.la \ + libsystemd-daemon-internal.la \ libsystemd-shared.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -2048,13 +1871,13 @@ udevadm_LDADD = \ # 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 hwdb-remove-hook: - -test -n "$(DESTDIR)" || rm -f $(HWDB_BIN) + -test -n "$(DESTDIR)" || rm -f /etc/udev/hwdb.bin # ------------------------------------------------------------------------------ TESTS += \ @@ -2340,7 +2163,6 @@ EXTRA_DIST += \ src/gudev/seed-example-enum.js \ src/gudev/seed-example.js - # ------------------------------------------------------------------------------ if ENABLE_KEYMAP keymap_SOURCES = \ @@ -2497,7 +2319,6 @@ libsystemd_id128_la_CFLAGS = \ libsystemd_id128_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -shared \ -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \ -Wl,--version-script=$(top_srcdir)/src/libsystemd-id128/libsystemd-id128.sym @@ -2543,6 +2364,18 @@ EXTRA_DIST += \ src/libsystemd-id128/libsystemd-id128.pc.in \ src/libsystemd-id128/libsystemd-id128.sym +# ------------------------------------------------------------------------------ + +rootlibexec_PROGRAMS += \ + systemd-activate + +systemd_activate_SOURCES = \ + src/activate/activate.c + +systemd_activate_LDADD = \ + libsystemd-shared.la \ + libsystemd-daemon.la + # ------------------------------------------------------------------------------ systemd_journald_SOURCES = \ src/journal/journald.c \ @@ -2584,13 +2417,6 @@ journalctl_LDADD += \ $(QRENCODE_LIBS) endif -systemd_coredumpctl_SOURCES = \ - src/journal/coredumpctl.c - -systemd_coredumpctl_LDADD = \ - libsystemd-shared.la \ - libsystemd-journal.la - test_journal_SOURCES = \ src/journal/test-journal.c @@ -2688,13 +2514,13 @@ libsystemd_journal_la_CFLAGS = \ libsystemd_journal_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -shared \ -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \ -Wl,--version-script=$(top_srcdir)/src/journal/libsystemd-journal.sym libsystemd_journal_la_LIBADD = \ libsystemd-shared.la \ libsystemd-label.la \ + libsystemd-daemon-internal.la \ libsystemd-id128-internal.la libsystemd_journal_internal_la_SOURCES = \ @@ -2779,9 +2605,16 @@ libsystemd_journal_internal_la_LIBADD += \ $(GCRYPT_LIBS) endif -# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed +# move lib from $(libdir) to $(rootlibdir) and update devel link, if +# needed. Also, grant read access to new journal files to members of +# "adm" and "wheel". libsystemd-journal-install-hook: libname=libsystemd-journal.so && $(move-to-rootlibdir) + -$(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/ + -setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/ libsystemd-journal-uninstall-hook: rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so* @@ -2789,6 +2622,8 @@ libsystemd-journal-uninstall-hook: INSTALL_EXEC_HOOKS += libsystemd-journal-install-hook UNINSTALL_EXEC_HOOKS += libsystemd-journal-uninstall-hook +# ------------------------------------------------------------------------------ + # Update catalog on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. catalog-update-hook: @@ -2833,7 +2668,6 @@ rootbin_PROGRAMS += \ journalctl bin_PROGRAMS += \ - systemd-coredumpctl \ systemd-cat dist_systemunit_DATA += \ @@ -2902,13 +2736,6 @@ nodist_systemunit_DATA += \ dist_gatewayddocumentroot_DATA = \ src/journal/browse.html -MANPAGES += \ - man/systemd-journal-gatewayd.service.8 -MANPAGES_ALIAS += \ - man/systemd-journal-gatewayd.socket.8 \ - man/systemd-journal-gatewayd.8 -man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8 -man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8 endif EXTRA_DIST += \ @@ -2932,6 +2759,19 @@ endif rootlibexec_PROGRAMS += \ systemd-coredump +systemd_coredumpctl_SOURCES = \ + src/journal/coredumpctl.c + +systemd_coredumpctl_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal.la + +bin_PROGRAMS += \ + systemd-coredumpctl + +dist_bashcompletion_DATA += \ + shell-completion/bash/systemd-coredumpctl + sysctl_DATA = \ sysctl.d/coredump.conf @@ -2968,14 +2808,6 @@ SYSINIT_TARGET_WANTS += \ systemd-binfmt.service \ proc-sys-fs-binfmt_misc.automount -MANPAGES += \ - man/binfmt.d.5 \ - man/systemd-binfmt.service.8 - -MANPAGES_ALIAS += \ - man/systemd-binfmt.8 - -man/systemd-binfmt.8: man/systemd-binfmt.service.8 endif EXTRA_DIST += \ @@ -2997,15 +2829,6 @@ nodist_systemunit_DATA += \ SYSINIT_TARGET_WANTS += \ systemd-vconsole-setup.service - -MANPAGES += \ - man/vconsole.conf.5 \ - man/systemd-vconsole-setup.service.8 - -MANPAGES_ALIAS += \ - man/systemd-vconsole-setup.8 - -man/systemd-vconsole-setup.8: man/systemd-vconsole-setup.service.8 endif EXTRA_DIST += \ @@ -3042,22 +2865,6 @@ nodist_systemunit_DATA += \ units/systemd-readahead-replay.service \ units/systemd-readahead-done.service -MANPAGES += \ - man/sd_readahead.3 \ - man/sd-readahead.3 \ - man/systemd-readahead-replay.service.8 - -MANPAGES_ALIAS += \ - man/systemd-readahead-collect.service.8 \ - man/systemd-readahead-done.service.8 \ - man/systemd-readahead-done.timer.8 \ - man/systemd-readahead.8 - -man/systemd-readahead-collect.service.8: man/systemd-readahead-replay.service.8 -man/systemd-readahead-done.service.8: man/systemd-readahead-replay.service.8 -man/systemd-readahead-done.timer.8: man/systemd-readahead-replay.service.8 -man/systemd-readahead.8: man/systemd-readahead-replay.service.8 - endif EXTRA_DIST += \ @@ -3076,10 +2883,6 @@ systemd_bootchart_SOURCES = \ systemd_bootchart_LDADD = \ libsystemd-shared.la -MANPAGES += \ - man/systemd-bootchart.1 \ - man/bootchart.conf.5 - rootlibexec_PROGRAMS += \ systemd-bootchart @@ -3100,15 +2903,6 @@ systemd_quotacheck_SOURCES = \ systemd_quotacheck_LDADD = \ libsystemd-shared.la - -MANPAGES += \ - man/systemd-quotacheck.service.8 - -MANPAGES_ALIAS += \ - man/systemd-quotacheck.8 - -man/systemd-quotacheck.8: man/systemd-quotacheck.service.8 - endif EXTRA_DIST += \ @@ -3138,16 +2932,6 @@ SHUTDOWN_TARGET_WANTS += \ SYSINIT_TARGET_WANTS += \ systemd-random-seed-load.service -MANPAGES += \ - man/systemd-random-seed-load.service.8 - -MANPAGES_ALIAS += \ - man/systemd-random-seed-save.service.8 \ - man/systemd-random-seed.8 - -man/systemd-random-seed-save.service.8: man/systemd-random-seed-load.service.8 -man/systemd-random-seed.8: man/systemd-random-seed-load.service.8 - endif EXTRA_DIST += \ @@ -3188,16 +2972,6 @@ systemd_cryptsetup_generator_LDADD = \ SYSINIT_TARGET_WANTS += \ cryptsetup.target -MANPAGES += \ - man/systemd-cryptsetup@.service.8 \ - man/systemd-cryptsetup-generator.8 \ - man/crypttab.5 - -MANPAGES_ALIAS += \ - man/systemd-cryptsetup.8 - -man/systemd-cryptsetup.8: man/systemd-cryptsetup@.service.8 - endif # ------------------------------------------------------------------------------ @@ -3210,6 +2984,7 @@ systemd_hostnamed_CFLAGS = \ $(DBUS_CFLAGS) systemd_hostnamed_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-dbus.la @@ -3240,14 +3015,6 @@ org.freedesktop.hostname1.xml: systemd-hostnamed SYSTEM_UNIT_ALIASES += \ systemd-hostnamed.service dbus-org.freedesktop.hostname1.service -MANPAGES += \ - man/systemd-hostnamed.service.8 - -MANPAGES_ALIAS += \ - man/systemd-hostnamed.8 - -man/systemd-hostnamed.8: man/systemd-hostnamed.service.8 - hostnamectl_SOURCES = \ src/hostname/hostnamectl.c @@ -3263,8 +3030,8 @@ hostnamectl_LDADD = \ bin_PROGRAMS += \ hostnamectl -MANPAGES += \ - man/hostnamectl.1 +dist_bashcompletion_DATA += \ + shell-completion/bash/hostnamectl endif @@ -3315,14 +3082,6 @@ org.freedesktop.locale1.xml: systemd-localed SYSTEM_UNIT_ALIASES += \ systemd-localed.service dbus-org.freedesktop.locale1.service -MANPAGES += \ - man/systemd-localed.service.8 - -MANPAGES_ALIAS += \ - man/systemd-localed.8 - -man/systemd-localed.8: man/systemd-localed.service.8 - dist_pkgdata_DATA += \ src/locale/kbd-model-map @@ -3347,8 +3106,8 @@ localectl_LDADD = \ bin_PROGRAMS += \ localectl -MANPAGES += \ - man/localectl.1 +dist_bashcompletion_DATA += \ + shell-completion/bash/localectl endif @@ -3368,6 +3127,7 @@ systemd_timedated_CFLAGS = \ $(DBUS_CFLAGS) systemd_timedated_LDADD = \ + libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-dbus.la @@ -3402,14 +3162,6 @@ INSTALL_DIRS += \ SYSTEM_UNIT_ALIASES += \ systemd-timedated.service dbus-org.freedesktop.timedate1.service -MANPAGES += \ - man/systemd-timedated.service.8 - -MANPAGES_ALIAS += \ - man/systemd-timedated.8 - -man/systemd-timedated.8: man/systemd-timedated.service.8 - timedatectl_SOURCES = \ src/timedate/timedatectl.c @@ -3424,9 +3176,8 @@ timedatectl_LDADD = \ bin_PROGRAMS += \ timedatectl -MANPAGES += \ - man/timedatectl.1 - +dist_bashcompletion_DATA += \ + shell-completion/bash/timedatectl endif polkitpolicy_in_files += \ @@ -3435,6 +3186,24 @@ polkitpolicy_in_files += \ 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 = \ @@ -3455,9 +3224,6 @@ libnss_myhostname_la_LDFLAGS = \ lib_LTLIBRARIES += \ libnss_myhostname.la - -MANPAGES += \ - man/nss-myhostname.8 endif # ------------------------------------------------------------------------------ @@ -3534,6 +3300,9 @@ loginctl_LDADD = \ rootbin_PROGRAMS += \ loginctl +dist_bashcompletion_DATA += \ + shell-completion/bash/loginctl + systemd_inhibit_SOURCES = \ src/login/inhibit.c @@ -3579,7 +3348,6 @@ libsystemd_login_la_CFLAGS = \ libsystemd_login_la_LDFLAGS = \ $(AM_LDFLAGS) \ - -shared \ -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \ -Wl,--version-script=$(top_srcdir)/src/login/libsystemd-login.sym @@ -3618,7 +3386,6 @@ pamlib_LTLIBRARIES = \ pam_systemd.la endif -# ------------------------------------------------------------------------------ # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed libsystemd-login-install-hook: libname=libsystemd-login.so && $(move-to-rootlibdir) @@ -3685,68 +3452,6 @@ nodist_udevrules_DATA += \ src/login/71-seat.rules \ src/login/73-seat-late.rules -MANPAGES += \ - man/systemd-logind.service.8 \ - man/logind.conf.5 \ - man/sd-login.3 \ - man/loginctl.1 \ - man/sd_login_monitor_new.3 \ - man/sd_pid_get_session.3 \ - man/sd_uid_get_state.3 \ - man/sd_session_is_active.3 \ - man/sd_seat_get_active.3 \ - man/sd_get_seats.3 \ - man/systemd-user-sessions.service.8 - -MANPAGES_ALIAS += \ - man/sd_login_monitor_unref.3 \ - man/sd_login_monitor_flush.3 \ - man/sd_login_monitor_get_fd.3 \ - man/sd_login_monitor.3 \ - man/sd_session_get_uid.3 \ - man/sd_session_get_seat.3 \ - man/sd_session_get_service.3 \ - man/sd_session_get_state.3 \ - man/sd_session_get_type.3 \ - man/sd_session_get_class.3 \ - man/sd_session_get_display.3 \ - man/sd_session_get_tty.3 \ - man/sd_pid_get_owner_uid.3 \ - man/sd_pid_get_unit.3 \ - man/sd_uid_is_on_seat.3 \ - man/sd_uid_get_sessions.3 \ - man/sd_uid_get_seats.3 \ - man/sd_seat_get_sessions.3 \ - man/sd_seat_can_multi_session.3 \ - man/sd_get_sessions.3 \ - man/sd_get_uids.3 \ - man/systemd-logind.8 \ - man/systemd-user-sessions.8 - -man/systemd-logind.8: man/systemd-logind.service.8 -man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3 -man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3 -man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3 -man/sd_login_monitor.3: man/sd_login_monitor_new.3 -man/sd_session_get_uid.3: man/sd_session_is_active.3 -man/sd_session_get_seat.3: man/sd_session_is_active.3 -man/sd_session_get_service.3: man/sd_session_is_active.3 -man/sd_session_get_state.3: man/sd_session_is_active.3 -man/sd_session_get_type.3: man/sd_session_is_active.3 -man/sd_session_get_class.3: man/sd_session_is_active.3 -man/sd_session_get_display.3: man/sd_session_is_active.3 -man/sd_session_get_tty.3: man/sd_session_is_active.3 -man/sd_pid_get_owner_uid.3: man/sd_pid_get_session.3 -man/sd_pid_get_unit.3: man/sd_pid_get_session.3 -man/sd_uid_is_on_seat.3: man/sd_uid_get_state.3 -man/sd_uid_get_sessions.3: man/sd_uid_get_state.3 -man/sd_uid_get_seats.3: man/sd_uid_get_state.3 -man/sd_seat_get_sessions.3: man/sd_seat_get_active.3 -man/sd_seat_can_multi_session.3: man/sd_seat_get_active.3 -man/sd_get_sessions.3: man/sd_get_seats.3 -man/sd_get_uids.3: man/sd_get_seats.3 -man/systemd-user-sessions.8: man/systemd-user-sessions.service.8 - CLEANFILES += \ src/login/logind-gperf.c \ src/login/71-seat.rules \ @@ -3766,11 +3471,11 @@ EXTRA_DIST += \ units/systemd-user-sessions.service.in # ------------------------------------------------------------------------------ - if HAVE_PYTHON_DEVEL - pkgpyexec_LTLIBRARIES = \ - _journal.la + _journal.la \ + id128.la \ + _reader.la _journal_la_SOURCES = \ src/python-systemd/_journal.c @@ -3790,14 +3495,82 @@ _journal_la_LIBADD = \ $(PYTHON_LIBS) \ libsystemd-journal.la +id128_la_SOURCES = \ + src/python-systemd/id128.c \ + src/python-systemd/id128-constants.h \ + src/python-systemd/pyutil.c \ + src/python-systemd/pyutil.h + +id128_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(PYTHON_CFLAGS) \ + -I$(top_builddir)/src/python-systemd + +id128_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -module \ + -avoid-version + +id128_la_LIBADD = \ + $(PYTHON_LIBS) \ + libsystemd-id128.la + +_reader_la_SOURCES = \ + src/python-systemd/_reader.c \ + src/python-systemd/pyutil.c \ + src/python-systemd/pyutil.h + +_reader_la_CFLAGS = \ + $(AM_CFLAGS) \ + -fvisibility=default \ + $(PYTHON_CFLAGS) + +_reader_la_LDFLAGS = \ + $(AM_LDFLAGS) \ + -shared \ + -module \ + -avoid-version + +_reader_la_LIBADD = \ + $(PYTHON_LIBS) \ + libsystemd-journal.la \ + libsystemd-id128.la \ + libsystemd-shared.la + dist_pkgpyexec_PYTHON = \ src/python-systemd/journal.py \ src/python-systemd/__init__.py +src/python-systemd/id128-constants.h: src/systemd/sd-messages.h Makefile + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@ + +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) +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/ + $(AM_V_at)echo Output has been generated in $(abs_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 && \ + rm -rf "$$dir" + endif -# ------------------------------------------------------------------------------ +CLEAN_LOCAL_HOOKS += clean-sphinx +clean-sphinx: + -rm -rf docs/html/python-systemd/ + +# ------------------------------------------------------------------------------ SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ $(SED) -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \ @@ -3806,6 +3579,8 @@ SED_PROCESS = \ -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' \ @@ -3864,10 +3639,6 @@ src/%.policy.in: src/%.policy.in.in Makefile $(SED_PROCESS) $(AM_V_GEN)chmod +x $@ -src/analyze/systemd-analyze: %: %.in Makefile - $(SED_PROCESS) - $(AM_V_GEN)chmod +x $@ - src/%.c: src/%.gperf $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_GPERF)$(GPERF) < $< > $@ @@ -3884,9 +3655,11 @@ units/user/%: units/%.m4 Makefile $(AM_V_M4)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ +if ENABLE_POLKIT nodist_polkitpolicy_DATA = \ $(polkitpolicy_files) \ $(polkitpolicy_in_in_files:.policy.in.in=.policy) +endif EXTRA_DIST += \ $(polkitpolicy_in_files) \ @@ -3895,11 +3668,11 @@ EXTRA_DIST += \ CLEANFILES += \ $(nodist_systemunit_DATA) \ $(nodist_userunit_DATA) \ - $(nodist_man_MANS) \ $(pkgconfigdata_DATA) \ $(pkgconfiglib_DATA) \ $(nodist_polkitpolicy_DATA) +# ------------------------------------------------------------------------------ if ENABLE_MANPAGES XSLTPROC_FLAGS = \ --nonet \ @@ -3935,11 +3708,13 @@ man/%.8: man/%.xml man/%.html: man/%.xml man/custom-html.xsl $(XSLTPROC_PROCESS_HTML) -CLEANFILES += \ - $(dist_man_MANS) \ - ${XML_FILES:.xml=.html} +define html-alias + $(AM_V_LN)$(LN_S) $(notdir $<) $@ +endef + endif +# ------------------------------------------------------------------------------ DBUS_PREPROCESS = $(CPP) -P $(CFLAGS) $(DBUS_CFLAGS) -imacros dbus/dbus-protocol.h CLEANFILES += \ @@ -3961,7 +3736,6 @@ docs/var-log/README: docs/var-log/README.in CLEANFILES += \ docs/sysvinit/README \ docs/var-log/README - endif EXTRA_DIST += \ @@ -4018,6 +3792,7 @@ SYSTEM_UNIT_ALIASES += \ graphical.target runlevel5.target \ reboot.target runlevel6.target endif + SYSTEM_UNIT_ALIASES += \ graphical.target default.target \ reboot.target ctrl-alt-del.target \ @@ -4044,6 +3819,7 @@ INSTALL_DIRS += \ $(systemunitdir)/runlevel4.target.wants \ $(systemunitdir)/runlevel5.target.wants endif + INSTALL_DIRS += \ $(tmpfilesdir) \ $(sysconfdir)/tmpfiles.d \ @@ -4072,7 +3848,7 @@ install-data-hook: $(INSTALL_DATA_HOOKS) 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 @@ -4082,6 +3858,7 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \ --with-dbussystemservicedir=$$dc_install_base/$(dbussystemservicedir) \ --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \ + --with-bashcompletiondir=$$dc_install_base/$(bashcompletiondir) \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-rootprefix=$$dc_install_base \ --disable-split-usr @@ -4114,17 +3891,19 @@ upload: all distcheck scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/ scp man/*.html tango:public/systemd-man/ -doc-sync: all +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.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/ + rsync -av --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.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/ - rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/ + 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 docs/html/python-systemd/ $(www_target)/python-systemd/ git-tag: git tag "v$(VERSION)" -m "systemd $(VERSION)" install-tree: all rm -rf $(abs_srcdir)/install-tree - make install DESTDIR=$(abs_srcdir)/install-tree + $(MAKE) install DESTDIR=$(abs_srcdir)/install-tree tree $(abs_srcdir)/install-tree