units: skip mounting /tmp if it is a symlink

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bfef1c305597a2cb62e865a6fac81c5949f9e232..bb85b2cd228774cdaca3e8ff0a4aad8ecc2d7080 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1846,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)
@@ -3771,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 \
@@ -3810,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
 
@@ -5173,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