build-sys: fix generation of user@.service

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f4b19589a1b1c6f7d5938bdb6ef5d629a9fc90a6..7556db8d70a9ac9a7afdce6a26ffe10a93fbe8b3 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -489,7 +489,7 @@ EXTRA_DIST += \
        units/user/systemd-exit.service.in \
        units/systemd-fsck@.service.in \
        units/systemd-fsck-root.service.in \
-       units/user@.service.in \
+       units/user@.service.m4.in \
        units/systemd-udevd.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.service \
@@ -508,7 +508,8 @@ CLEANFILES += \
        units/console-shell.service.m4 \
        units/console-getty.service.m4 \
        units/container-getty@.service.m4 \
-       units/rescue.service.m4
+       units/rescue.service.m4 \
+       units/user@.service.m4
 
 if HAVE_SYSV_COMPAT
 nodist_systemunit_DATA += \
@@ -1584,6 +1585,7 @@ nodist_systemunit_DATA += \
 
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
+       tmpfiles.d/systemd-nologin.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf
 
@@ -4611,11 +4613,11 @@ src/%: src/%.m4
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 units/%: units/%.m4
-       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 units/user/%: units/%.m4
-       $(AM_V_M4)$(MKDIR_P) $(dir $@)
+       $(AM_V_at)$(MKDIR_P) $(dir $@)
        $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
@@ -5012,4 +5014,4 @@ tests += \
        test-libudev-sym
 
 cppcheck:
-       cppcheck --enable=all $(top_srcdir)
+       cppcheck --enable=all -q $(top_srcdir)