user-sessions: move into own subdir and build independently of logind

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7f01668c3fedc751516c524a553dddb59894a038..5847bb4ae4f9a79e223f65cda58881c2a679af81 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -393,7 +393,8 @@ rootlibexec_PROGRAMS = \
        systemd-sleep \
        systemd-bus-proxyd \
        systemd-socket-proxyd \
-       systemd-update-done
+       systemd-update-done \
+       systemd-user-sessions
 
 if HAVE_UTMP
 rootlibexec_PROGRAMS += \
@@ -499,6 +500,7 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-fs-fuse-connections.mount \
        units/tmp.mount \
+       units/var-lib-machines.mount \
        units/printer.target \
        units/sound.target \
        units/bluetooth.target \
@@ -553,7 +555,8 @@ nodist_systemunit_DATA = \
        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 += \
@@ -606,7 +609,8 @@ EXTRA_DIST += \
        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 \
@@ -2121,6 +2125,13 @@ systemd_update_done_LDADD = \
        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
@@ -2530,6 +2541,7 @@ efi_cflags = \
        $(EFI_CFLAGS) \
        -Wall \
        -Wextra \
+       -std=gnu90 \
        -nostdinc \
        -ggdb -O0 \
        -fpic \
@@ -2546,8 +2558,7 @@ if ARCH_X86_64
 efi_cflags += \
        -mno-red-zone \
        -DEFI_FUNCTION_WRAPPER \
-       -DGNU_EFI_USE_MS_ABI \
-       -std=gnu90
+       -DGNU_EFI_USE_MS_ABI
 endif
 
 efi_ldflags = \
@@ -2600,11 +2611,15 @@ $(systemd_boot): $(systemd_boot_solib)
 stub_headers = \
        src/boot/efi/util.h \
        src/boot/efi/pefile.h \
+       src/boot/efi/graphics.h \
+       src/boot/efi/splash.h \
        src/boot/efi/linux.h
 
 stub_sources = \
        src/boot/efi/util.c \
        src/boot/efi/pefile.c \
+       src/boot/efi/graphics.c \
+       src/boot/efi/splash.c \
        src/boot/efi/linux.c \
        src/boot/efi/stub.c
 
@@ -5902,15 +5917,8 @@ endif
 noinst_LTLIBRARIES += \
        libsystemd-logind-core.la
 
-systemd_user_sessions_SOURCES = \
-       src/login/user-sessions.c
-
-systemd_user_sessions_LDADD = \
-       libsystemd-shared.la
-
 rootlibexec_PROGRAMS += \
-       systemd-logind \
-       systemd-user-sessions
+       systemd-logind
 
 loginctl_SOURCES = \
        src/login/loginctl.c \
@@ -6010,8 +6018,7 @@ dist_pamconf_DATA = \
 endif
 
 nodist_systemunit_DATA += \
-       units/systemd-logind.service \
-       units/systemd-user-sessions.service
+       units/systemd-logind.service
 
 dist_systemunit_DATA += \
        units/user.slice
@@ -6035,8 +6042,7 @@ INSTALL_DIRS += \
        $(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
@@ -6065,8 +6071,7 @@ EXTRA_DIST += \
        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
@@ -6586,11 +6591,13 @@ SYSINIT_TARGET_WANTS += \
 
 LOCAL_FS_TARGET_WANTS += \
        systemd-remount-fs.service \
-       tmp.mount
+       tmp.mount \
+       var-lib-machines.mount
 
 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 \