chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
user-sessions: move into own subdir and build independently of logind
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index 74c9a5028cf46df969232d8bd157448aeb9dc8c4..5847bb4ae4f9a79e223f65cda58881c2a679af81 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-393,7
+393,8
@@
rootlibexec_PROGRAMS = \
systemd-sleep \
systemd-bus-proxyd \
systemd-socket-proxyd \
systemd-sleep \
systemd-bus-proxyd \
systemd-socket-proxyd \
- systemd-update-done
+ systemd-update-done \
+ systemd-user-sessions
if HAVE_UTMP
rootlibexec_PROGRAMS += \
if HAVE_UTMP
rootlibexec_PROGRAMS += \
@@
-554,7
+555,8
@@
nodist_systemunit_DATA = \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service \
units/systemd-nspawn@.service \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service \
units/systemd-nspawn@.service \
- units/systemd-update-done.service
+ units/systemd-update-done.service \
+ units/systemd-user-sessions.service
if HAVE_UTMP
nodist_systemunit_DATA += \
if HAVE_UTMP
nodist_systemunit_DATA += \
@@
-607,7
+609,8
@@
EXTRA_DIST += \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/systemd-nspawn@.service.in \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/systemd-nspawn@.service.in \
- units/systemd-update-done.service.in
+ units/systemd-update-done.service.in \
+ units/systemd-user-sessions.service.in
CLEANFILES += \
units/console-shell.service.m4 \
CLEANFILES += \
units/console-shell.service.m4 \
@@
-2122,6
+2125,13
@@
systemd_update_done_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
libsystemd-label.la \
libsystemd-shared.la
+# ------------------------------------------------------------------------------
+systemd_user_sessions_SOURCES = \
+ src/user-sessions/user-sessions.c
+
+systemd_user_sessions_LDADD = \
+ libsystemd-shared.la
+
# ------------------------------------------------------------------------------
systemd_shutdownd_SOURCES = \
src/shutdownd/shutdownd.c
# ------------------------------------------------------------------------------
systemd_shutdownd_SOURCES = \
src/shutdownd/shutdownd.c
@@
-2566,14
+2576,12
@@
systemd_boot_headers = \
src/boot/efi/util.h \
src/boot/efi/console.h \
src/boot/efi/graphics.h \
src/boot/efi/util.h \
src/boot/efi/console.h \
src/boot/efi/graphics.h \
- src/boot/efi/splash.h \
src/boot/efi/pefile.h
systemd_boot_sources = \
src/boot/efi/util.c \
src/boot/efi/console.c \
src/boot/efi/graphics.c \
src/boot/efi/pefile.h
systemd_boot_sources = \
src/boot/efi/util.c \
src/boot/efi/console.c \
src/boot/efi/graphics.c \
- src/boot/efi/splash.c \
src/boot/efi/pefile.c \
src/boot/efi/boot.c
src/boot/efi/pefile.c \
src/boot/efi/boot.c
@@
-5909,15
+5917,8
@@
endif
noinst_LTLIBRARIES += \
libsystemd-logind-core.la
noinst_LTLIBRARIES += \
libsystemd-logind-core.la
-systemd_user_sessions_SOURCES = \
- src/login/user-sessions.c
-
-systemd_user_sessions_LDADD = \
- libsystemd-shared.la
-
rootlibexec_PROGRAMS += \
rootlibexec_PROGRAMS += \
- systemd-logind \
- systemd-user-sessions
+ systemd-logind
loginctl_SOURCES = \
src/login/loginctl.c \
loginctl_SOURCES = \
src/login/loginctl.c \
@@
-6017,8
+6018,7
@@
dist_pamconf_DATA = \
endif
nodist_systemunit_DATA += \
endif
nodist_systemunit_DATA += \
- units/systemd-logind.service \
- units/systemd-user-sessions.service
+ units/systemd-logind.service
dist_systemunit_DATA += \
units/user.slice
dist_systemunit_DATA += \
units/user.slice
@@
-6042,8
+6042,7
@@
INSTALL_DIRS += \
$(systemdstatedir)
MULTI_USER_TARGET_WANTS += \
$(systemdstatedir)
MULTI_USER_TARGET_WANTS += \
- systemd-logind.service \
- systemd-user-sessions.service
+ systemd-logind.service
SYSTEM_UNIT_ALIASES += \
systemd-logind.service dbus-org.freedesktop.login1.service
SYSTEM_UNIT_ALIASES += \
systemd-logind.service dbus-org.freedesktop.login1.service
@@
-6072,8
+6071,7
@@
EXTRA_DIST += \
src/login/logind-gperf.gperf \
src/login/71-seat.rules.in \
src/login/73-seat-late.rules.in \
src/login/logind-gperf.gperf \
src/login/71-seat.rules.in \
src/login/73-seat-late.rules.in \
- units/systemd-logind.service.in \
- units/systemd-user-sessions.service.in
+ units/systemd-logind.service.in
# ------------------------------------------------------------------------------
if HAVE_PYTHON_DEVEL
# ------------------------------------------------------------------------------
if HAVE_PYTHON_DEVEL
@@
-6598,7
+6596,8
@@
LOCAL_FS_TARGET_WANTS += \
MULTI_USER_TARGET_WANTS += \
getty.target \
MULTI_USER_TARGET_WANTS += \
getty.target \
- systemd-ask-password-wall.path
+ systemd-ask-password-wall.path \
+ systemd-user-sessions.service
SYSINIT_TARGET_WANTS += \
dev-hugepages.mount \
SYSINIT_TARGET_WANTS += \
dev-hugepages.mount \