Move x-systemd-device.timeout handling from core to fstab-generator

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index bfef1c305597a2cb62e865a6fac81c5949f9e232..783f5fe188d7e266bc127f62b509b09703c6b86e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -90,6 +90,8 @@ userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysusersdir=$(prefix)/lib/sysusers.d
 sysctldir=$(prefix)/lib/sysctl.d
+binfmtdir=$(prefix)/lib/binfmt.d
+modulesloaddir=$(prefix)/lib/modules-load.d
 networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
@@ -814,8 +816,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/bus-label.c \
        src/shared/bus-label.h \
        src/shared/gpt.h \
-       src/shared/generator.h \
-       src/shared/generator.c \
        src/shared/clean-ipc.h \
        src/shared/clean-ipc.c \
        src/shared/login-shared.c \
@@ -872,7 +872,11 @@ libsystemd_label_la_SOURCES = \
        src/shared/fileio-label.c \
        src/shared/fileio-label.h \
        src/shared/dev-setup.c \
-       src/shared/dev-setup.h
+       src/shared/dev-setup.h \
+       src/shared/dropin.c \
+       src/shared/dropin.h \
+       src/shared/generator.h \
+       src/shared/generator.c
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1846,15 +1850,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 +3778,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 +3819,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
 
@@ -5121,7 +5142,11 @@ substitutions = \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|'
+       '|TTY_GID=$(TTY_GID)|' \
+       '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
+       '|binfmtdir=$(binfmtdir)|' \
+       '|modulesloaddir=$(modulesloaddir)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -5173,7 +5198,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