SUBDIRS = . po
-LIBUDEV_CURRENT=13
-LIBUDEV_REVISION=3
-LIBUDEV_AGE=13
+LIBUDEV_CURRENT=1
+LIBUDEV_REVISION=1
+LIBUDEV_AGE=0
LIBGUDEV_CURRENT=1
LIBGUDEV_REVISION=1
LIBGUDEV_AGE=1
LIBSYSTEMD_LOGIN_CURRENT=2
-LIBSYSTEMD_LOGIN_REVISION=1
+LIBSYSTEMD_LOGIN_REVISION=4
LIBSYSTEMD_LOGIN_AGE=2
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=5
LIBSYSTEMD_ID128_AGE=0
-LIBSYSTEMD_JOURNAL_CURRENT=0
-LIBSYSTEMD_JOURNAL_REVISION=3
-LIBSYSTEMD_JOURNAL_AGE=0
+LIBSYSTEMD_JOURNAL_CURRENT=1
+LIBSYSTEMD_JOURNAL_REVISION=1
+LIBSYSTEMD_JOURNAL_AGE=1
# Dirs of external packages
dbuspolicydir=@dbuspolicydir@
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
-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"\" \
systemd-cgtop \
systemd-stdio-bridge \
systemd-nspawn \
- systemd-detect-virt
+ systemd-detect-virt \
+ systemd-delta
dist_bin_SCRIPTS = \
src/analyze/systemd-analyze
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/syslog.target \
units/systemd-udev-control.socket \
units/systemd-udev-kernel.socket \
- units/systemd-timedated-ntp.target
+ units/systemd-timedated-ntp.target \
+ units/system-update.target
nodist_systemunit_DATA = \
units/getty@.service \
units/systemd-sysctl.service \
units/halt.service \
units/emergency.service \
+ units/hibernate.service \
units/poweroff.service \
units/reboot.service \
units/kexec.service \
units/fsck@.service \
units/fsck-root.service \
units/rescue.service \
+ units/suspend.service \
units/user@.service \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
- units/systemd-udev-settle.service
+ units/systemd-udev-settle.service \
+ units/systemd-debug-shell.service
dist_userunit_DATA = \
units/user/default.target \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
+ units/systemd-debug-shell.service.in \
+ units/hibernate.service.in \
+ units/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/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/systemd-journald.service.8 \
man/journalctl.1 \
man/systemd-inhibit.1
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.8
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.8: man/systemd-journald.service.8
XML_FILES = \
${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
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 \
# ------------------------------------------------------------------------------
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 = \
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
nodist_libsystemd_core_la_SOURCES = \
src/core/load-fragment-gperf.c \
libsystemd_core_la_LIBADD = \
libsystemd-capability.la \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-dbus.la \
$(DBUS_CFLAGS)
test_install_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la
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
$(DBUS_CFLAGS)
systemctl_LDADD = \
+ libsystemd-units.la \
libsystemd-label.la \
libsystemd-shared.la \
libsystemd-daemon.la \
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
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
+ mkdir -p $(DESTDIR)$(systemunitdir)/sysinit.target.wants
+ ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev.service
+ ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/sysinit.target.wants/systemd-udev-trigger.service
INSTALL_DATA_HOOKS += systemd-install-hook
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
dist_udevkeymap_DATA = \
libsystemd-shared.la \
libsystemd-audit.la \
libsystemd-daemon.la \
- libsystemd-login.la \
libsystemd-id128.la
+if ENABLE_LOGIND
+systemd_journald_LDADD += \
+ libsystemd-login.la
+endif
+
if HAVE_ACL
systemd_journald_LDADD += \
libsystemd-acl.la
systemd_coredump_LDADD = \
libsystemd-journal.la \
- libsystemd-login.la \
libsystemd-label.la \
libsystemd-shared.la
+if ENABLE_LOGIND
+systemd_coredump_LDADD += \
+ libsystemd-login.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
systemd_readahead_replay_SOURCES = \
src/readahead/readahead-replay.c \
- src/readahead/readahead-common.c
+ src/readahead/readahead-common.c \
+ src/readahead/readahead-common.h
systemd_readahead_replay_LDADD = \
libsystemd-shared.la \
libsystemd-daemon.la \
libudev.la
+systemd_readahead_analyze_SOURCES = \
+ src/readahead/readahead-analyze.c \
+ src/readahead/readahead-common.h
+
pkginclude_HEADERS += \
src/systemd/sd-readahead.h
systemd-readahead-collect \
systemd-readahead-replay
+bin_PROGRAMS += \
+ systemd-readahead-analyze
+
dist_systemunit_DATA += \
+ units/systemd-readahead-drop.service \
units/systemd-readahead-done.timer
nodist_systemunit_DATA += \
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 \
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/loginctl.1 \
man/sd_get_seats.3
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_get_sessions.3 \
man/sd_get_uids.3
+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
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,@VERSION\@,$(VERSION),g' \
-e 's,@rootprefix\@,$(rootprefix),g' \
-e 's,@udevlibexecdir\@,$(libexecdir)/udev,g' \
+ -e 's,@sushell\@,$(sushell),g' \
< $< > $@ || rm $@
units/%: units/%.in Makefile
$(DESTDIR)$(prefix)/lib/sysctl.d \
$(DESTDIR)$(sysconfdir)/sysctl.d \
$(DESTDIR)$(systemshutdowndir) \
+ $(DESTDIR)$(systemsleepdir) \
$(DESTDIR)$(systemgeneratordir) \
$(DESTDIR)$(usergeneratordir)
$(MKDIR_P) -m 0755 \
( 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)$(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 && \
~ianmdlvl / elogind.git / blobdiff