SUBDIRS = . po
-LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=13
+# remove targets if the command fails
+.DELETE_ON_ERROR:
+
+LIBUDEV_CURRENT=1
+LIBUDEV_REVISION=2
+LIBUDEV_AGE=0
LIBGUDEV_CURRENT=1
-LIBGUDEV_REVISION=1
+LIBGUDEV_REVISION=2
LIBGUDEV_AGE=1
-LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=1
-LIBSYSTEMD_LOGIN_AGE=2
+LIBSYSTEMD_LOGIN_CURRENT=3
+LIBSYSTEMD_LOGIN_REVISION=0
+LIBSYSTEMD_LOGIN_AGE=3
LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=1
+LIBSYSTEMD_DAEMON_REVISION=2
LIBSYSTEMD_DAEMON_AGE=0
LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=3
+LIBSYSTEMD_ID128_REVISION=6
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=3
-LIBSYSTEMD_JOURNAL_AGE=0
+LIBSYSTEMD_JOURNAL_CURRENT=2
+LIBSYSTEMD_JOURNAL_REVISION=0
+LIBSYSTEMD_JOURNAL_AGE=2
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
pkgconfiglibdir=$(libdir)/pkgconfig
polkitpolicydir=$(datadir)/polkit-1/actions
bashcompletiondir=$(sysconfdir)/bash_completion.d
+rpmmacrosdir=$(sysconfdir)/rpm
# Our own, non-special dirs
pkgsysconfdir=$(sysconfdir)/systemd
userunitdir=$(prefix)/lib/systemd/user
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
-usergeneratordir=$(pkglibexecdir)/user-generators
+usergeneratordir=$(prefix)/lib/systemd/user-generators
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
systemshutdowndir=$(rootlibexecdir)/system-shutdown
+systemsleepdir=$(rootlibexecdir)/system-sleep
systemunitdir=$(rootprefix)/lib/systemd/system
udevlibexecdir=$(rootprefix)/lib/udev
-udevhomedir = $(libexecdir)/udev
-udevrulesdir = $(libexecdir)/udev/rules.d
+udevhomedir = $(udevlibexecdir)
+udevrulesdir = $(udevlibexecdir)/rules.d
# And these are the special ones for /
rootprefix=@rootprefix@
rootbindir=$(rootprefix)/bin
rootlibexecdir=$(rootprefix)/lib/systemd
-CLEANFILES =
+CLEANFILES = BUILT_SOURCES
EXTRA_DIST =
BUILT_SOURCES =
INSTALL_EXEC_HOOKS =
nodist_udevrules_DATA =
dist_man_MANS =
dist_pkgsysconf_DATA =
+dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dbusinterface_DATA =
dist_dbussystemservice_DATA =
-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
-DSYSTEMD_SHUTDOWN_BINARY_PATH=\"$(rootlibexecdir)/systemd-shutdown\" \
+ -DSYSTEMD_SLEEP_BINARY_PATH=\"$(rootlibexecdir)/systemd-sleep\" \
-DSYSTEMCTL_BINARY_PATH=\"$(rootbindir)/systemctl\" \
-DSYSTEMD_TTY_ASK_PASSWORD_AGENT_BINARY_PATH=\"$(rootbindir)/systemd-tty-ask-password-agent\" \
-DSYSTEMD_STDIO_BRIDGE_BINARY_PATH=\"$(bindir)/systemd-stdio-bridge\" \
-DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
-DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
-DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+ -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
-DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
-DX_SERVER=\"$(bindir)/X\" \
- -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
+ -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\" \
-DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
-I $(top_srcdir)/src \
-I $(top_srcdir)/src/shared \
-I $(top_srcdir)/src/login \
-I $(top_srcdir)/src/journal \
-I $(top_srcdir)/src/systemd \
+ -I $(top_builddir)/src/core \
-I $(top_srcdir)/src/core \
-I $(top_srcdir)/src/libudev \
-I $(top_srcdir)/src/udev
-DKBD_SETFONT=\"/bin/setfont\" \
-DDEFAULT_FONT=\"LatArCyrHeb-16\"
else
-if TARGET_MEEGO
-AM_CPPFLAGS += \
- -DKBD_LOADKEYS=\"/bin/loadkeys\" \
- -DKBD_SETFONT=\"/bin/setfont\" \
- -DDEFAULT_FONT=\"LatArCyrHeb-16\"
-else
if TARGET_ANGSTROM
AM_CPPFLAGS += \
-DKBD_LOADKEYS=\"/usr/bin/loadkeys\" \
endif
endif
endif
-endif
# ------------------------------------------------------------------------------
rootbin_PROGRAMS = \
systemd-cgtop \
systemd-stdio-bridge \
systemd-nspawn \
- systemd-detect-virt
+ systemd-detect-virt \
+ systemd-delta
dist_bin_SCRIPTS = \
src/analyze/systemd-analyze
systemd-shutdownd \
systemd-shutdown \
systemd-modules-load \
- systemd-remount-api-vfs \
+ systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
systemd-timestamp \
systemd-ac-power \
- systemd-sysctl
+ systemd-sysctl \
+ systemd-sleep
systemgenerator_PROGRAMS = \
- systemd-getty-generator
+ systemd-getty-generator \
+ systemd-fstab-generator \
+ systemd-system-update-generator
dist_bashcompletion_DATA = \
bash-completion/systemd-bash-completion.sh
units/nss-lookup.target \
units/nss-user-lookup.target \
units/mail-transfer-agent.target \
+ units/hibernate.target \
units/http-daemon.target \
units/poweroff.target \
units/reboot.target \
units/final.target \
units/umount.target \
units/sigpwr.target \
+ units/sleep.target \
units/sockets.target \
+ units/suspend.target \
units/swap.target \
units/systemd-initctl.socket \
units/systemd-shutdownd.socket \
units/sys-kernel-debug.mount \
units/sys-fs-fuse-connections.mount \
units/tmp.mount \
- units/remount-rootfs.service \
units/printer.target \
units/sound.target \
units/bluetooth.target \
units/systemd-ask-password-wall.path \
units/systemd-ask-password-console.path \
units/syslog.target \
- units/systemd-udev-control.socket \
- units/systemd-udev-kernel.socket
+ units/systemd-udevd-control.socket \
+ units/systemd-udevd-kernel.socket \
+ units/system-update.target
nodist_systemunit_DATA = \
units/getty@.service \
units/serial-getty@.service \
units/console-shell.service \
+ units/console-getty.service \
units/systemd-initctl.service \
units/systemd-shutdownd.service \
units/systemd-modules-load.service \
- units/systemd-remount-api-vfs.service \
+ units/systemd-remount-fs.service \
units/systemd-update-utmp-runlevel.service \
units/systemd-update-utmp-shutdown.service \
units/systemd-tmpfiles-setup.service \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
- units/halt.service \
units/emergency.service \
- units/poweroff.service \
- units/reboot.service \
- units/kexec.service \
- units/fsck@.service \
- units/fsck-root.service \
units/rescue.service \
units/user@.service \
- units/systemd-udev.service \
+ units/systemd-hibernate.service \
+ units/systemd-suspend.service \
+ units/systemd-halt.service \
+ units/systemd-poweroff.service \
+ units/systemd-reboot.service \
+ units/systemd-kexec.service \
+ units/systemd-fsck@.service \
+ units/systemd-fsck-root.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
- units/systemd-udev-settle.service
+ units/systemd-udev-settle.service \
+ units/debug-shell.service
dist_userunit_DATA = \
units/user/default.target \
units/user/exit.target
nodist_userunit_DATA = \
- units/user/exit.service
+ units/user/systemd-exit.service
EXTRA_DIST += \
units/getty@.service.m4 \
units/serial-getty@.service.m4 \
units/console-shell.service.m4.in \
+ units/console-getty.service.m4.in \
units/rescue.service.m4.in \
units/systemd-initctl.service.in \
units/systemd-shutdownd.service.in \
units/systemd-modules-load.service.in \
- units/systemd-remount-api-vfs.service.in \
+ units/systemd-remount-fs.service.in \
units/systemd-update-utmp-runlevel.service.in \
units/systemd-update-utmp-shutdown.service.in \
units/systemd-tmpfiles-setup.service.in \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/emergency.service.in \
- units/halt.service.in \
- units/poweroff.service.in \
- units/reboot.service.in \
- units/kexec.service.in \
- units/user/exit.service.in \
- units/fsck@.service.in \
- units/fsck-root.service.in \
+ units/systemd-halt.service.in \
+ units/systemd-poweroff.service.in \
+ units/systemd-reboot.service.in \
+ units/systemd-kexec.service.in \
+ units/user/systemd-exit.service.in \
+ units/systemd-fsck@.service.in \
+ units/systemd-fsck-root.service.in \
units/user@.service.in \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
+ units/debug-shell.service.in \
+ units/systemd-hibernate.service.in \
+ units/systemd-suspend.service.in \
introspect.awk \
man/custom-html.xsl
systemd-rc-local-generator
endif
-if HAVE_PLYMOUTH
-dist_systemunit_DATA += \
- units/plymouth-start.service \
- units/plymouth-read-write.service \
- units/plymouth-quit.service \
- units/plymouth-quit-wait.service \
- units/plymouth-reboot.service \
- units/plymouth-kexec.service \
- units/plymouth-poweroff.service \
- units/plymouth-halt.service \
- units/systemd-ask-password-plymouth.path
-
-nodist_systemunit_DATA += \
- units/systemd-ask-password-plymouth.service
-
-EXTRA_DIST += \
- units/systemd-ask-password-plymouth.service.in
-endif
-
dist_doc_DATA = \
README \
NEWS \
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.exec.5 \
man/systemd.special.7 \
man/systemd.journal-fields.7 \
+ man/kernel-command-line.7 \
man/daemon.7 \
+ man/bootup.7 \
man/runlevel.8 \
man/telinit.8 \
man/halt.8 \
man/os-release.5 \
man/machine-info.5 \
man/modules-load.d.5 \
+ man/systemd-modules-load.service.8 \
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/journalctl.1
+ man/systemd-journald.service.8 \
+ man/journalctl.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_add_match.3 \
+ man/sd_journal_seek_head.3
MANPAGES_ALIAS = \
man/reboot.8 \
man/poweroff.8 \
- man/init.1
+ man/init.1 \
+ man/systemd-modules-load.8 \
+ 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-sleep.8 \
+ man/systemd-shutdown.8 \
+ man/systemd-poweroff.service.8 \
+ man/systemd-reboot.service.8 \
+ man/systemd-kexec.service.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_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_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_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_seek_tail.3 \
+ man/sd_journal_seek_monotonic_usec.3 \
+ man/sd_journal_seek_realtime_usec.3 \
+ man/sd_journal_seek_cursor.3
man/reboot.8: man/halt.8
man/poweroff.8: man/halt.8
man/init.1: man/systemd.1
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+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-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-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_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_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_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_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
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
noinst_DATA = \
${XML_FILES:.xml=.html}
+
+CLEANFILES += \
+ $(MANPAGES) \
+ $(MANPAGES_ALIAS) \
+ ${XML_FILES:.xml=.html}
+
+if HAVE_PYTHON
+noinst_DATA += \
+ man/index.html
+
+CLEANFILES += \
+ man/index.html
+
+$(builddir)/man/index.html: $(XML_FILES:.xml=.html) $(top_srcdir)/make-man-index.py
+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+ $(PYTHON) $(top_srcdir)/make-man-index.py $(XML_FILES) > $@
+
+EXTRA_DIST += \
+ man/index.html
+endif
+
endif
EXTRA_DIST += \
$(XML_FILES) \
${XML_FILES:.xml=.html} \
$(MANPAGES) \
- $(MANPAGES_ALIAS)
+ $(MANPAGES_ALIAS) \
+ make-man-index.py
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd_shared_la_SOURCES = \
src/shared/linux/auto_dev-ioctl.h \
src/shared/linux/fanotify.h \
+ src/shared/linux/seccomp.h \
+ src/shared/linux/seccomp-bpf.h \
src/shared/missing.h \
src/shared/list.h \
src/shared/macro.h \
src/shared/util.h \
src/shared/virt.c \
src/shared/virt.h \
+ src/shared/path-util.c \
+ src/shared/path-util.h \
src/shared/hashmap.c \
src/shared/hashmap.h \
src/shared/set.c \
src/shared/ioprio.h \
src/shared/socket-util.c \
src/shared/socket-util.h \
+ src/shared/conf-files.c \
+ src/shared/conf-files.h \
src/shared/cgroup-util.c \
src/shared/cgroup-util.h \
src/shared/cgroup-show.c \
src/shared/specifier.c \
src/shared/specifier.h \
src/shared/spawn-polkit-agent.c \
- src/shared/spawn-polkit-agent.h
-
-libsystemd_shared_la_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ src/shared/spawn-polkit-agent.h \
+ src/shared/hwclock.c \
+ src/shared/hwclock.h
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
- libsystemd-label.la
+ libsystemd-units.la
-libsystemd_label_la_SOURCES = \
+libsystemd_units_la_SOURCES = \
src/shared/install.c \
src/shared/install.h \
src/shared/path-lookup.c \
- src/shared/path-lookup.h \
+ src/shared/path-lookup.h
+
+libsystemd_units_la_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
src/shared/cgroup-label.c \
src/shared/socket-label.c \
src/shared/label.c \
libsystemd_label_la_CFLAGS = \
$(AM_CFLAGS) \
- $(DBUS_CFLAGS) \
$(SELINUX_CFLAGS)
libsystemd_label_la_LIBADD = \
$(AM_CFLAGS)
libsystemd_logs_la_LIBADD = \
- libsystemd-journal.la \
- libsystemd-id128.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
+ libsystemd-shared.la
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
src/core/job.h \
src/core/manager.c \
src/core/manager.h \
+ src/core/transaction.c \
+ src/core/transaction.h \
src/core/load-fragment.c \
src/core/load-fragment.h \
src/core/service.c \
src/core/special.h \
src/core/bus-errors.h \
src/core/build.h \
- src/core/sysfs-show.h
+ src/core/sysfs-show.h \
+ src/core/switch-root.h \
+ src/core/switch-root.c \
+ src/core/killall.h \
+ src/core/killall.c \
+ src/core/syscall-list.c \
+ src/core/syscall-list.h
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
- src/core/load-fragment-gperf-nulstr.c
+ src/core/load-fragment-gperf-nulstr.c \
+ src/core/syscall-from-name.h \
+ src/core/syscall-to-name.h
libsystemd_core_la_CFLAGS = \
$(AM_CFLAGS) \
libsystemd_core_la_LIBADD = \
libsystemd-capability.la \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
src/core/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@ || rm $@
+ $(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
EXTRA_DIST += \
src/core/load-fragment-gperf.gperf.m4
CLEANFILES += \
src/core/load-fragment-gperf.gperf \
src/core/load-fragment-gperf.c \
- src/core/load-fragment-gperf-nulstr.c
+ src/core/load-fragment-gperf-nulstr.c \
+ src/core/syscall-list.txt \
+ src/core/syscall-from-name.gperf
+
+BUILT_SOURCES += \
+ src/core/syscall-from-name.h \
+ src/core/syscall-to-name.h
+
+src/core/syscall-list.txt: Makefile
+ $(AM_V_GEN)cpp $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/syscall.h < /dev/null | $(AWK) '/^#define[ \t]+__NR_[^ ]+[ \t]+[0-9]/ { sub(/__NR_/, "", $$2); print $$2; }' > $@
+
+src/core/syscall-from-name.gperf: src/core/syscall-list.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct syscall_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, __NR_%s\n", $$1, $$1 }' < $< > $@
+
+src/core/syscall-from-name.h: src/core/syscall-from-name.gperf Makefile
+ $(AM_V_GEN)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_syscall -H hash_syscall_name -p -C < $< > $@
+
+src/core/syscall-to-name.h: src/core/syscall-list.txt Makefile
+ $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const syscall_names[] = { "} { printf "[__NR_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' < $< > $@
# ------------------------------------------------------------------------------
systemd_SOURCES = \
systemd_LDADD = \
libsystemd-core.la \
libsystemd-daemon.la \
- libsystemd-id128.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la
dist_pkgsysconf_DATA += \
pkgconfigdata_DATA = \
src/core/systemd.pc
+nodist_rpmmacros_DATA = \
+ src/core/macros.systemd
+
EXTRA_DIST += \
- src/core/systemd.pc.in
+ src/core/systemd.pc.in \
+ src/core/macros.systemd.in
+
+CLEANFILES += \
+ src/core/macros.systemd
# ------------------------------------------------------------------------------
noinst_PROGRAMS += \
test-env-replace \
test-strv \
test-install \
- test-watchdog
+ test-watchdog \
+ test-unit-name
TESTS += \
test-job-type \
test-env-replace \
- test-strv
+ test-strv \
+ test-unit-name
test_engine_SOURCES = \
src/test/test-engine.c
$(DBUS_CFLAGS)
test_job_type_LDADD = \
- libsystemd-core.la
+ libsystemd-core.la \
+ libsystemd-daemon.la
test_ns_SOURCES = \
src/test/test-ns.c
test_hostname_LDADD = \
libsystemd-core.la
+test_unit_name_SOURCES = \
+ src/test/test-unit-name.c
+
+test_unit_name_LDADD = \
+ libsystemd-core.la
+
test_daemon_SOURCES = \
src/test/test-daemon.c
$(DBUS_CFLAGS)
test_install_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la
src/core/umount.h \
src/core/shutdown.c \
src/core/mount-setup.c \
- src/core/mount-setup.h
+ src/core/mount-setup.h \
+ src/core/killall.h \
+ src/core/killall.c
systemd_shutdown_LDADD = \
libsystemd-label.la \
systemd_machine_id_setup_LDADD = \
libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
systemd_sysctl_LDADD = \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_sleep_SOURCES = \
+ src/sleep/sleep.c
+
+systemd_sleep_LDADD = \
+ libsystemd-shared.la
+
# ------------------------------------------------------------------------------
systemd_fsck_SOURCES = \
src/fsck/fsck.c
systemd_detect_virt_LDADD = \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_delta_SOURCES = \
+ src/delta/delta.c
+
+systemd_delta_LDADD = \
+ libsystemd-shared.la
+
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
libsystemd-label.la \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_fstab_generator_SOURCES = \
+ src/fstab-generator/fstab-generator.c \
+ src/core/mount-setup.c
+
+systemd_fstab_generator_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
+# ------------------------------------------------------------------------------
+systemd_system_update_generator_SOURCES = \
+ src/system-update-generator/system-update-generator.c
+
+systemd_system_update_generator_LDADD = \
+ libsystemd-label.la \
+ libsystemd-shared.la
+
# ------------------------------------------------------------------------------
systemd_rc_local_generator_SOURCES = \
src/rc-local-generator/rc-local-generator.c
libsystemd-shared.la
# ------------------------------------------------------------------------------
-systemd_remount_api_vfs_SOURCES = \
- src/remount-api-vfs/remount-api-vfs.c \
+systemd_remount_fs_SOURCES = \
+ src/remount-fs/remount-fs.c \
src/core/mount-setup.c \
src/core/mount-setup.h
-systemd_remount_api_vfs_LDADD = \
+systemd_remount_fs_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
$(DBUS_CFLAGS)
systemctl_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-dbus.la \
libsystemd-logs.la
libsystemd-label.la \
libsystemd-capability.la \
libsystemd-shared.la \
- libsystemd-daemon.la
+ libsystemd-daemon.la \
+ libsystemd-id128-internal.la
# ------------------------------------------------------------------------------
systemd_stdio_bridge_SOURCES = \
src/libsystemd-daemon/libsystemd-daemon.pc
MANPAGES += \
- man/sd-daemon.7 \
+ man/sd-daemon.3 \
man/sd_notify.3 \
man/sd_listen_fds.3 \
man/sd_is_fifo.3 \
man/sd_is_socket_unix.3 \
man/sd_is_socket_inet.3 \
man/sd_is_mq.3 \
- man/sd_notifyf.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 \
libudev_la_LDFLAGS = \
$(AM_LDFLAGS) \
- -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
+ -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
+ -Wl,--version-script=$(top_srcdir)/src/libudev/libudev.sym
libudev_la_LIBADD = \
libsystemd-shared.la
src/libudev/libudev.pc
EXTRA_DIST += \
- src/libudev/libudev.pc.in
+ src/libudev/libudev.pc.in \
+ src/libudev/libudev.sym
CLEANFILES += \
src/libudev/libudev.pc
MANPAGES += \
man/udev.7 \
man/udevadm.8 \
+ man/systemd-udevd.service.8
+
+MANPAGES_ALIAS += \
man/systemd-udevd.8
udev-confdirs:
-mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
- -mkdir -p $(DESTDIR)$(libexecdir)/udev/devices
INSTALL_DATA_HOOKS += udev-confdirs
src/udev/udev.pc
EXTRA_DIST += \
- units/systemd-udev.service.in \
+ units/systemd-udevd.service.in \
units/systemd-udev-trigger.service.in \
units/systemd-udev-settle.service.in
CLEANFILES += \
- units/systemd-udev.service \
+ units/systemd-udevd.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service
systemd-install-hook:
mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
- ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
- ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
- mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
- ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
- ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
+ ln -sf ../systemd-udevd-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-control.socket
+ ln -sf ../systemd-udevd-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udevd-kernel.socket
+ mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+ ln -sf ../systemd-udevd.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udevd.service
+ ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
libudev.la
test_udev_SOURCES = \
- src/test/test-udev.c \
- $(libudev_core_la_SOURCES) \
- $(libudev_private_la_SOURCES)
-
-# The test-udev program needs everything compiled with relative path
-# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
-test_udev_CFLAGS = \
- -DTEST_PREFIX=\"test\" \
- $(libudev_core_la_CFLAGS) \
- $(libudev_private_la_CFLAGS)
-
-test_udev_CPPFLAGS =\
- $(libudev_core_la_CPPFLAGS)
+ src/test/test-udev.c
test_udev_LDADD = \
- libsystemd-label.la \
+ libudev-core.la \
libsystemd-shared.la \
$(BLKID_LIBS) \
$(KMOD_LIBS) \
src/gudev/seed-example-enum.js \
src/gudev/seed-example.js
-CLEANFILES += \
- $(nodist_libgudev_1_0_la_SOURCES)
-
src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
$(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
src/udev/keymap/check-keymaps.sh
EXTRA_DIST += \
- src/udev/keymap/check-keymaps.sh
+ src/udev/keymap/check-keymaps.sh \
+ src/udev/keymap/keyboard-force-release.sh.in
CLEANFILES += \
- $(nodist_keymap_SOURCES) \
src/udev/keymap/keys.txt \
- src/udev/keymap/keys-from-name.gperf
+ src/udev/keymap/keys-from-name.gperf \
+ src/udev/keymap/keyboard-force-release.sh
-udevkeymapdir = $(libexecdir)/udev/keymaps
+udevkeymapdir = $(udevlibexecdir)/keymaps
dist_udevkeymap_DATA = \
keymaps/acer \
keymaps/acer-aspire_5720 \
keymaps/toshiba-satellite_m30x \
keymaps/zepto-znote
-udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
+udevkeymapforcereldir = $(udevlibexecdir)/keymaps/force-release
dist_udevkeymapforcerel_DATA = \
keymaps-force-release/dell-touchpad \
keymaps-force-release/dell-xps \
keymaps-force-release/samsung-90x3a \
keymaps-force-release/common-volume-keys
-src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
+src/udev/keymap/keys.txt: Makefile
$(AM_V_at)mkdir -p src/udev/keymap
- $(AM_V_GEN)$(AWK) '/^#define.*KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' < $< | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+ $(AM_V_GEN)cpp $(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
+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
libsystemd_id128_la_LIBADD = \
libsystemd-shared.la
+libsystemd_id128_internal_la_SOURCES = \
+ $(libsystemd_id128_la_SOURCES)
+
test_id128_SOURCES = \
src/test/test-id128.c
test_id128_LDADD = \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
noinst_PROGRAMS += \
test-id128
lib_LTLIBRARIES += \
libsystemd-id128.la
+noinst_LTLIBRARIES += \
+ libsystemd-id128-internal.la
+
pkgconfiglib_DATA += \
src/libsystemd-id128/libsystemd-id128.pc
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libsystemd-login.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
+
+if ENABLE_LOGIND
+systemd_journald_LDADD += \
+ libsystemd-login-internal.la
+endif
if HAVE_ACL
systemd_journald_LDADD += \
systemd_cat_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal-internal.la
journalctl_SOURCES = \
src/journal/journalctl.c
journalctl_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la \
- libsystemd-id128.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la \
libsystemd-logs.la
test_journal_SOURCES = \
- src/journal/test-journal.c \
- src/journal/sd-journal.c \
- src/journal/journal-file.c \
- src/journal/lookup3.c \
- src/journal/journal-send.c
+ src/journal/test-journal.c
test_journal_LDADD = \
- libsystemd-label.la \
libsystemd-shared.la \
- libsystemd-id128.la
-
-if HAVE_XZ
-test_journal_SOURCES += \
- src/journal/compress.c
-
-test_journal_CFLAGS = \
- $(AM_CFLAGS) \
- $(XZ_CFLAGS)
-
-test_journal_LDADD += \
- $(XZ_LIBS)
-endif
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
test_journal_send_SOURCES = \
src/journal/test-journal-send.c
test_journal_send_LDADD = \
libsystemd-shared.la \
- libsystemd-journal.la
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
+test_journal_match_SOURCES = \
+ src/journal/test-journal-match.c
+
+test_journal_match_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
+
+test_journal_stream_SOURCES = \
+ src/journal/test-journal-stream.c
+
+test_journal_stream_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-journal-internal.la \
+ libsystemd-id128-internal.la
libsystemd_journal_la_SOURCES = \
src/journal/sd-journal.c \
libsystemd_journal_la_LIBADD = \
libsystemd-shared.la \
- libsystemd-id128.la
+ libsystemd-id128-internal.la
+
+libsystemd_journal_internal_la_SOURCES = \
+ $(libsystemd_journal_la_SOURCES)
if HAVE_XZ
libsystemd_journal_la_SOURCES += \
libsystemd_journal_la_LIBADD += \
$(XZ_LIBS)
+
+libsystemd_journal_internal_la_CFLAGS = \
+ $(AM_CFLAGS)
+ $(XZ_CFLAGS)
+
+libsystemd_journal_internal_la_LIBADD = \
+ $(XZ_LIBS)
+
endif
# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
noinst_PROGRAMS += \
test-journal \
- test-journal-send
+ test-journal-send \
+ test-journal-match \
+ test-journal-stream
+
+TESTS += \
+ test-journal \
+ test-journal-match \
+ test-journal-stream
pkginclude_HEADERS += \
src/systemd/sd-journal.h \
lib_LTLIBRARIES += \
libsystemd-journal.la
+noinst_LTLIBRARIES += \
+ libsystemd-journal-internal.la
+
rootlibexec_PROGRAMS += \
systemd-journald
units/systemd-journald.socket
nodist_systemunit_DATA += \
- units/systemd-journald.service
+ units/systemd-journald.service \
+ units/systemd-journal-flush.service
dist_pkgsysconf_DATA += \
src/journal/journald.conf
src/journal/libsystemd-journal.pc.in \
src/journal/libsystemd-journal.sym \
units/systemd-journald.service.in \
+ units/systemd-journal-flush.service.in \
src/journal/journald-gperf.gperf
CLEANFILES += \
src/journal/coredump.c
systemd_coredump_LDADD = \
- libsystemd-journal.la \
- libsystemd-login.la \
+ libsystemd-journal-internal.la \
libsystemd-label.la \
libsystemd-shared.la
+if ENABLE_LOGIND
+systemd_coredump_LDADD += \
+ libsystemd-login-internal.la
+endif
+
rootlibexec_PROGRAMS += \
systemd-coredump
binfmt-install-data-hook
MANPAGES += \
- man/binfmt.d.5
+ man/binfmt.d.5 \
+ man/systemd-binfmt.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-binfmt.8
+
+man/systemd-binfmt.8: man/systemd-binfmt.service.8
EXTRA_DIST += \
units/systemd-binfmt.service.in
vconsole-install-data-hook
MANPAGES += \
- man/vconsole.conf.5
+ 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
EXTRA_DIST += \
units/systemd-vconsole-setup.service.in
# ------------------------------------------------------------------------------
if ENABLE_READAHEAD
-systemd_readahead_collect_SOURCES = \
+systemd_readahead_SOURCES = \
+ src/readahead/readahead.c \
src/readahead/readahead-collect.c \
+ src/readahead/readahead-replay.c \
+ src/readahead/readahead-analyze.c \
src/readahead/readahead-common.c \
src/readahead/readahead-common.h
-systemd_readahead_collect_LDADD = \
+systemd_readahead_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
libudev.la
-systemd_readahead_replay_SOURCES = \
- src/readahead/readahead-replay.c \
- src/readahead/readahead-common.c
-
-systemd_readahead_replay_LDADD = \
- libsystemd-shared.la \
- libsystemd-daemon.la \
- libudev.la
-
-pkginclude_HEADERS += \
+dist_doc_DATA += \
+ src/readahead/sd-readahead.c \
src/systemd/sd-readahead.h
rootlibexec_PROGRAMS += \
- systemd-readahead-collect \
- systemd-readahead-replay
+ systemd-readahead
dist_systemunit_DATA += \
+ units/systemd-readahead-drop.service \
units/systemd-readahead-done.timer
nodist_systemunit_DATA += \
MANPAGES += \
man/sd_readahead.3 \
- man/sd-readahead.7
+ 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
# ------------------------------------------------------------------------------
systemd-quotacheck
nodist_systemunit_DATA += \
- units/quotacheck.service
+ units/systemd-quotacheck.service
EXTRA_DIST += \
- units/quotacheck.service.in
+ units/systemd-quotacheck.service.in
systemd_quotacheck_SOURCES = \
src/quotacheck/quotacheck.c
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
# ------------------------------------------------------------------------------
INSTALL_DATA_HOOKS += \
randomseed-install-data-hook
+
+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
# ------------------------------------------------------------------------------
INSTALL_DATA_HOOKS += \
cryptsetup-install-data-hook
+
+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
# ------------------------------------------------------------------------------
INSTALL_DATA_HOOKS += \
hostnamed-install-data-hook
+MANPAGES += \
+ man/systemd-hostnamed.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-hostnamed.8
+
+man/systemd-hostnamed.8: man/systemd-hostnamed.service.8
+
EXTRA_DIST += \
units/systemd-hostnamed.service.in
endif
INSTALL_DATA_HOOKS += \
localed-install-data-hook
+MANPAGES += \
+ man/systemd-localed.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-localed.8
+
+man/systemd-localed.8: man/systemd-localed.service.8
+
EXTRA_DIST += \
units/systemd-localed.service.in
-dist_pkgdata_DATA = \
+dist_pkgdata_DATA += \
src/locale/kbd-model-map
dist_noinst_SCRIPT = \
INSTALL_DATA_HOOKS += \
timedated-install-data-hook
+MANPAGES += \
+ man/systemd-timedated.service.8
+
+MANPAGES_ALIAS += \
+ man/systemd-timedated.8
+
+man/systemd-timedated.8: man/systemd-timedated.service.8
+
EXTRA_DIST += \
units/systemd-timedated.service.in
endif
src/login/logind-dbus.c \
src/login/logind-device.c \
src/login/logind-device.h \
+ src/login/logind-button.c \
+ src/login/logind-button.h \
src/login/logind-seat.c \
src/login/logind-seat.h \
src/login/logind-session.c \
rootbin_PROGRAMS += \
loginctl
+systemd_inhibit_SOURCES = \
+ src/login/inhibit.c
+
+systemd_inhibit_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(DBUS_CFLAGS)
+
+systemd_inhibit_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-dbus.la
+
+rootbin_PROGRAMS += \
+ systemd-inhibit
+
test_login_SOURCES = \
src/login/test-login.c
test_login_LDADD = \
- libsystemd-login.la \
+ libsystemd-login-internal.la \
libsystemd-shared.la
test_inhibit_SOURCES = \
libsystemd_login_la_LIBADD = \
libsystemd-shared.la
+libsystemd_login_internal_la_SOURCES = \
+ $(libsystemd_login_la_SOURCES)
+
if HAVE_PAM
pam_systemd_la_SOURCES = \
src/login/pam-module.c
lib_LTLIBRARIES += \
libsystemd-login.la
+noinst_LTLIBRARIES += \
+ libsystemd-login-internal.la
+
pkgconfiglib_DATA += \
src/login/libsystemd-login.pc
dist_udevrules_DATA += \
src/login/70-uaccess.rules \
- src/login/71-seat.rules
+ src/login/70-power-switch.rules
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.7 \
+ 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/sd_get_seats.3 \
+ man/systemd-user-sessions.service.8
MANPAGES_ALIAS += \
+ man/systemd-logind.8 \
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_seat_get_sessions.3 \
man/sd_seat_can_multi_session.3 \
man/sd_get_sessions.3 \
- man/sd_get_uids.3
+ man/sd_get_uids.3 \
+ 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_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
EXTRA_DIST += \
src/login/logind-gperf.gperf \
src/login/libsystemd-login.pc.in \
src/login/libsystemd-login.sym \
+ src/login/71-seat.rules.in \
src/login/73-seat-late.rules.in \
units/systemd-logind.service.in \
units/systemd-user-sessions.service.in
CLEANFILES += \
src/login/logind-gperf.c \
+ src/login/71-seat.rules \
src/login/73-seat-late.rules
endif
# ------------------------------------------------------------------------------
-e 's,@SYSTEMD_NOTIFY\@,$(rootbindir)/systemd-notify,g' \
-e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
-e 's,@pkgdatadir\@,$(pkgdatadir),g' \
- -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
-e 's,@systemunitdir\@,$(systemunitdir),g' \
-e 's,@userunitdir\@,$(userunitdir),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\@,$(libexecdir)/udev,g' \
- < $< > $@ || rm $@
+ -e 's,@udevlibexecdir\@,$(udevlibexecdir),g' \
+ -e 's,@sushell\@,$(sushell),g' \
+ < $< > $@
units/%: units/%.in Makefile
$(SED_PROCESS)
%.pc: %.pc.in Makefile
$(SED_PROCESS)
+src/core/macros.%: src/core/macros.%.in Makefile
+ $(SED_PROCESS)
+
src/%.policy.in: src/%.policy.in.in Makefile
$(SED_PROCESS)
src/%: src/%.m4
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) < $< > $@ || rm $@
+ $(M4) -P $(M4_DEFINES) < $< > $@
M4_PROCESS_SYSTEM = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ || rm $@
+ $(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
M4_PROCESS_USER = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
- $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@ || rm $@
+ $(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
units/%: units/%.m4 Makefile
$(M4_PROCESS_SYSTEM)
XSLTPROC_FLAGS = \
--nonet \
--stringparam man.output.quietly 1 \
- --stringparam funcsynopsis.style ansi
+ --stringparam funcsynopsis.style ansi \
+ --stringparam man.th.extra1.suppress 1 \
+ --stringparam man.authors.section.enabled 0 \
+ --stringparam man.copyright.section.enabled 0
XSLTPROC_PROCESS_MAN = \
$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
man/%.8: man/%.xml
$(XSLTPROC_PROCESS_MAN)
-man/%.html: man/%.xml
+man/%.html: man/%.xml man/custom-html.xsl
$(XSLTPROC_PROCESS_HTML)
CLEANFILES += \
$(DESTDIR)$(prefix)/lib/sysctl.d \
$(DESTDIR)$(sysconfdir)/sysctl.d \
$(DESTDIR)$(systemshutdowndir) \
+ $(DESTDIR)$(systemsleepdir) \
$(DESTDIR)$(systemgeneratordir) \
$(DESTDIR)$(usergeneratordir)
$(MKDIR_P) -m 0755 \
rm -f systemd-update-utmp-shutdown.service && \
$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
- rm -f systemd-remount-api-vfs.service \
- fsck-root.service \
- remount-rootfs.service \
+ rm -f systemd-remount-fs.service \
+ systemd-fsck-root.service \
tmp.mount && \
- $(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
- $(LN_S) ../fsck-root.service fsck-root.service && \
- $(LN_S) ../remount-rootfs.service remount-rootfs.service && \
+ $(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
+ $(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
$(LN_S) ../tmp.mount tmp.mount )
( cd $(DESTDIR)$(userunitdir) && \
rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
( cd $(DESTDIR)$(dbussessionservicedir) && \
rm -f org.freedesktop.systemd1.service && \
$(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
-if HAVE_PLYMOUTH
- $(MKDIR_P) -m 0755 \
- $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
- $(DESTDIR)$(systemunitdir)/reboot.target.wants \
- $(DESTDIR)$(systemunitdir)/kexec.target.wants \
- $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
- $(DESTDIR)$(systemunitdir)/halt.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
- rm -f plymouth-start.service plymouth-read-write.service && \
- $(LN_S) ../plymouth-start.service plymouth-start.service && \
- $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f plymouth-quit.service plymouth-quit-wait.service && \
- $(LN_S) ../plymouth-quit.service plymouth-quit.service && \
- $(LN_S) ../plymouth-quit-wait.service plymouth-quit-wait.service )
- ( cd $(DESTDIR)$(systemunitdir)/reboot.target.wants && \
- rm -f plymouth-reboot.service && \
- $(LN_S) ../plymouth-reboot.service plymouth-reboot.service )
- ( cd $(DESTDIR)$(systemunitdir)/kexec.target.wants && \
- rm -f plymouth-kexec.service && \
- $(LN_S) ../plymouth-kexec.service plymouth-kexec.service )
- ( cd $(DESTDIR)$(systemunitdir)/poweroff.target.wants && \
- rm -f plymouth-poweroff.service && \
- $(LN_S) ../plymouth-poweroff.service plymouth-poweroff.service )
- ( cd $(DESTDIR)$(systemunitdir)/halt.target.wants && \
- rm -f plymouth-halt.service && \
- $(LN_S) ../plymouth-halt.service plymouth-halt.service )
-endif
-if TARGET_MEEGO
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
- rm -f network.target && \
- $(LN_S) $(systemunitdir)/network.target network.target )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/sysinit.target.wants && \
- rm -f * )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
- rm -f * )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
- rm -f * )
- ( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
- rm -f * )
-endif
if TARGET_FEDORA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_MANDRIVA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service dm.service single.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service && \
$(LN_S) rescue.service single.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
if TARGET_DEBIAN_OR_UBUNTU
endif
if TARGET_SUSE
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
( cd $(DESTDIR)$(systemunitdir) && \
rm -f local.service && \
$(LN_S) rc-local.service local.service )
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
endif
if TARGET_MAGEIA
- $(MKDIR_P) -m 0755 $(DESTDIR)$(systemunitdir)/final.target.wants
- ( cd $(DESTDIR)$(systemunitdir)/final.target.wants && \
- rm -f halt-local.service && \
- $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
( cd $(DESTDIR)$(systemunitdir) && \
rm -f display-manager.service && \
$(LN_S) prefdm.service display-manager.service && \
$(LN_S) prefdm.service dm.service )
- ( cd $(DESTDIR)$(systemunitdir)/graphical.target.wants && \
- rm -f display-manager.service && \
- $(LN_S) $(systemunitdir)/display-manager.service display-manager.service )
endif
install-exec-hook: $(INSTALL_EXEC_HOOKS)
scp man/*.html tango:public/systemd-man/
doc-sync: all
- rsync -av --delete docs/libudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
- rsync -av --delete docs/gudev/html/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
- rsync -av man/*.html www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+ 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/
+ 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/
git-tag:
git tag "v$(VERSION)" -m "systemd $(VERSION)"
~ianmdlvl / elogind.git / blobdiff