X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=9d41a2c71e8b780fc577a3d6795168c4a8912ba1;hb=0acfdffe9417b4218e97b6d981c99a1a85e633c9;hp=7f01668c3fedc751516c524a553dddb59894a038;hpb=a804d849b3c2199bc25d1d4e65fc119fa4d7d0e2;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 7f01668c3..9d41a2c71 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -499,6 +499,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 \
@@ -976,6 +977,8 @@ libsystemd_label_la_SOURCES = \
 	src/shared/btrfs-ctree.h \
 	src/shared/machine-image.c \
 	src/shared/machine-image.h \
+	src/shared/machine-pool.c \
+	src/shared/machine-pool.h \
 	src/shared/copy.c \
 	src/shared/copy.h
 
@@ -2530,6 +2533,7 @@ efi_cflags = \
 	$(EFI_CFLAGS) \
 	-Wall \
 	-Wextra \
+	-std=gnu90 \
 	-nostdinc \
 	-ggdb -O0 \
 	-fpic \
@@ -2539,6 +2543,7 @@ efi_cflags = \
 	-fno-strict-aliasing \
 	-fno-stack-protector \
 	-Wsign-compare \
+	-Wno-missing-field-initializers \
 	-mno-sse \
 	-mno-mmx
 
@@ -2546,8 +2551,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 +2604,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 +5910,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 \
@@ -6007,11 +6008,11 @@ pamlib_LTLIBRARIES = \
 
 dist_pamconf_DATA = \
 	src/login/systemd-user
+
 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 +6036,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,10 +6065,33 @@ 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-logind.service.in
+
+# ------------------------------------------------------------------------------
+if HAVE_PAM
+
+systemd_user_sessions_SOURCES = \
+	src/user-sessions/user-sessions.c
+
+systemd_user_sessions_LDADD = \
+	libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+	systemd-user-sessions
+
+nodist_systemunit_DATA += \
+	units/systemd-user-sessions.service
+
+EXTRA_DIST += \
 	units/systemd-user-sessions.service.in
 
+MULTI_USER_TARGET_WANTS += \
+	systemd-user-sessions.service
+
+endif
+
 # ------------------------------------------------------------------------------
+
 if HAVE_PYTHON_DEVEL
 pkgpyexec_LTLIBRARIES = \
 	_journal.la \
@@ -6586,7 +6609,8 @@ 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 \