X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=bb85b2cd228774cdaca3e8ff0a4aad8ecc2d7080;hb=ce9f1527b685402974e15c30b2caf3c1fe3ceb81;hp=37a164e562c28be7b388cbca812b401b853fde63;hpb=5549f483d06d2e5c91da76b5780c5f0e217b472e;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 37a164e56..bb85b2cd2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -827,7 +827,9 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/eventfd-util.c \
 	src/shared/eventfd-util.h \
 	src/shared/copy.c \
-	src/shared/copy.h
+	src/shared/copy.h \
+	src/shared/base-filesystem.c \
+	src/shared/base-filesystem.h
 
 nodist_libsystemd_shared_la_SOURCES = \
 	src/shared/errno-from-name.h \
@@ -1844,15 +1846,18 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
 	systemd-sysusers.service
 
-nodist_sysusers_DATA = \
+dist_sysusers_DATA = \
 	sysusers.d/systemd.conf
 
+nodist_sysusers_DATA = \
+	sysusers.d/basic.conf
+
 EXTRA_DIST += \
 	units/systemd-sysusers.service.in \
-	sysusers.d/systemd.conf.in
+	sysusers.d/basic.conf.in
 
 CLEANFILES += \
-	sysusers.d/systemd.conf
+	sysusers.d/basic.conf
 
 INSTALL_DIRS += \
 	$(sysusersdir)
@@ -3507,6 +3512,15 @@ test_catalog_CPPFLAGS = \
 test_catalog_LDADD = \
 	libsystemd-journal-core.la
 
+if HAVE_XZ
+test_compress_SOURCES = \
+	src/journal/test-compress.c
+
+test_compress_LDADD = \
+	libsystemd-journal-internal.la \
+	libsystemd-shared.la
+endif
+
 libsystemd_journal_core_la_SOURCES = \
 	src/journal/journald-kmsg.c \
 	src/journal/journald-kmsg.h \
@@ -3589,6 +3603,10 @@ tests += \
 	test-mmap-cache \
 	test-catalog
 
+if HAVE_XZ
+tests += test-compress
+endif
+
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
 	src/systemd/sd-messages.h \
@@ -3756,7 +3774,9 @@ systemd_socket_proxyd_LDADD = \
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
-	src/journal/coredump.c
+	src/journal/coredump.c \
+	src/journal/coredump-vacuum.c \
+	src/journal/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
 	libsystemd-journal-internal.la \
@@ -3795,6 +3815,18 @@ coredumpctl_LDADD = \
 bin_PROGRAMS += \
 	coredumpctl
 
+manual_tests += \
+	test-coredump-vacuum
+
+test_coredump_vacuum_SOURCES = \
+	src/journal/test-coredump-vacuum.c  \
+	src/journal/coredump-vacuum.c \
+	src/journal/coredump-vacuum.h
+
+test_coredump_vacuum_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
 dist_bashcompletion_DATA += \
 	shell-completion/bash/coredumpctl
 
@@ -4286,6 +4318,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-timesyncd.service
 
+GENERAL_ALIASES += \
+	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-timesyncd.service
+
 EXTRA_DIST += \
 	units/systemd-timesyncd.service.in
 
@@ -5155,7 +5190,7 @@ units/user/%: units/%.m4
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
-nodist_polkitpolicy_DATA = \
+dist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
 endif