udev: rules - ignore the lack of trailing newline

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b52ff8e77dfba1c9448dc2869ebaa3e34dbd249e..791508bb0ffa827eb3134d8ea11c924f6bb97467 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1149,6 +1149,7 @@ libsystemd_core_la_CFLAGS = \
        $(KMOD_CFLAGS) \
        $(APPARMOR_CFLAGS) \
        $(SECCOMP_CFLAGS) \
+       $(MOUNT_CFLAGS) \
        -pthread
 
 libsystemd_core_la_LIBADD = \
@@ -1161,7 +1162,8 @@ libsystemd_core_la_LIBADD = \
        $(AUDIT_LIBS) \
        $(KMOD_LIBS) \
        $(APPARMOR_LIBS) \
-       $(SECCOMP_LIBS)
+       $(SECCOMP_LIBS) \
+       $(MOUNT_LIBS)
 
 if HAVE_SECCOMP
 libsystemd_core_la_LIBADD += \
@@ -1383,7 +1385,10 @@ EXTRA_DIST += \
        test/bus-policy/hello.conf \
        test/bus-policy/methods.conf \
        test/bus-policy/ownerships.conf \
-       test/bus-policy/signals.conf
+       test/bus-policy/signals.conf \
+       test/bus-policy/check-own-rules.conf \
+       test/bus-policy/many-rules.conf \
+       test/bus-policy/test.conf
 
 
 EXTRA_DIST += \
@@ -2036,7 +2041,6 @@ nodist_tmpfiles_DATA = \
 dist_tmpfiles_DATA = \
        tmpfiles.d/systemd.conf \
        tmpfiles.d/systemd-nologin.conf \
-       tmpfiles.d/systemd-remote.conf \
        tmpfiles.d/tmp.conf \
        tmpfiles.d/x11.conf \
        tmpfiles.d/var.conf
@@ -2091,8 +2095,7 @@ SYSINIT_TARGET_WANTS += \
        systemd-sysusers.service
 
 dist_sysusers_DATA = \
-       sysusers.d/systemd.conf \
-       sysusers.d/systemd-remote.conf
+       sysusers.d/systemd.conf
 
 nodist_sysusers_DATA = \
        sysusers.d/basic.conf
@@ -3285,6 +3288,7 @@ dist_udevrules_DATA += \
        rules/50-udev-default.rules \
        rules/60-drm.rules \
        rules/60-keyboard.rules \
+       rules/70-mouse.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-serial.rules \
        rules/60-persistent-input.rules \
@@ -3311,7 +3315,8 @@ dist_udevhwdb_DATA = \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
        hwdb/20-net-ifname.hwdb \
-       hwdb/60-keyboard.hwdb
+       hwdb/60-keyboard.hwdb \
+       hwdb/70-mouse.hwdb
 
 udevconfdir = $(sysconfdir)/udev
 dist_udevconf_DATA = \
@@ -3836,6 +3841,16 @@ systemd_journal_remote_CFLAGS = \
 systemd_journal_remote_LDADD += \
        $(MICROHTTPD_LIBS)
 
+if ENABLE_SYSUSERS
+dist_sysusers_DATA += \
+       sysusers.d/systemd-remote.conf
+endif
+
+if ENABLE_TMPFILES
+dist_tmpfiles_DATA += \
+       tmpfiles.d/systemd-remote.conf
+endif
+
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
        $(GNUTLS_LIBS)