X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=782a7c09af7ebff119ca34bb864bbd18c8104f75;hp=e77a2427c6f424a101d3d2bbe279eda9b544efec;hb=ff88a301e93cf1bddbaa7faa981f390a2a81a4bb;hpb=7361099e4245ee31f6d70dc659d78fc533952893

diff --git a/Makefile.am b/Makefile.am
index e77a2427c..782a7c09a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -145,6 +145,7 @@ dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
 dist_systemunit_DATA_busnames =
+dist_sysusers_DATA =
 check_PROGRAMS =
 check_DATA =
 tests=
@@ -977,6 +978,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
 
@@ -2212,10 +2215,10 @@ nodist_systemunit_DATA += \
 	units/systemd-tmpfiles-clean.service
 
 nodist_tmpfiles_DATA = \
+	tmpfiles.d/systemd.conf \
 	tmpfiles.d/etc.conf
 
 dist_tmpfiles_DATA = \
-	tmpfiles.d/systemd.conf \
 	tmpfiles.d/systemd-nologin.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf \
@@ -2242,12 +2245,14 @@ INSTALL_DIRS += \
 endif
 
 EXTRA_DIST += \
+	tmpfiles.d/systemd.conf.m4 \
 	tmpfiles.d/etc.conf.m4 \
 	units/systemd-tmpfiles-setup-dev.service.in \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in
 
 CLEANFILES += \
+	tmpfiles.d/systemd.conf \
 	tmpfiles.d/etc.conf
 
 # ------------------------------------------------------------------------------
@@ -2270,17 +2275,17 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
 	systemd-sysusers.service
 
-dist_sysusers_DATA = \
-	sysusers.d/systemd.conf
-
 nodist_sysusers_DATA = \
+	sysusers.d/systemd.conf \
 	sysusers.d/basic.conf
 
 EXTRA_DIST += \
 	units/systemd-sysusers.service.in \
+	sysusers.d/systemd.conf.m4 \
 	sysusers.d/basic.conf.in
 
 CLEANFILES += \
+	sysusers.d/systemd.conf \
 	sysusers.d/basic.conf
 
 INSTALL_DIRS += \
@@ -2359,6 +2364,7 @@ systemd_fsck_LDADD = \
 # ------------------------------------------------------------------------------
 systemd_fsckd_SOURCES = \
 	src/fsckd/fsckd.c \
+	src/fsckd/fsckd.h \
 	$(NULL)
 
 systemd_fsckd_LDADD = \
@@ -2541,6 +2547,7 @@ efi_cflags = \
 	-fno-strict-aliasing \
 	-fno-stack-protector \
 	-Wsign-compare \
+	-Wno-missing-field-initializers \
 	-mno-sse \
 	-mno-mmx
 
@@ -3933,9 +3940,14 @@ TESTS += \
 if HAVE_PYTHON
 TESTS += \
 	test/rule-syntax-check.py \
+	$(NULL)
+
+if HAVE_SYSV_COMPAT
+TESTS += \
 	test/sysv-generator-test.py \
 	$(NULL)
 endif
+endif
 
 manual_tests += \
 	test-libudev \
@@ -4814,7 +4826,7 @@ dist_bashcompletion_DATA += \
 dist_zshcompletion_DATA += \
 	shell-completion/zsh/_coredumpctl
 
-sysctl_DATA = \
+nodist_sysctl_DATA = \
 	sysctl.d/50-coredump.conf
 
 CLEANFILES += \
@@ -5907,15 +5919,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 \
@@ -6012,11 +6017,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
@@ -6040,8 +6045,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
@@ -6070,10 +6074,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 \