bus: fix callback index when dispatching kernel messages

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 72a81206507bb6cf9e362bf1ee509b44365b2ed6..3598edd262bdd400d57b5fc2abb81b8e61c6d2a8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -769,7 +769,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/errno-list.c \
        src/shared/errno-list.h \
        src/shared/syscall-list.c \
-       src/shared/syscall-list.h
+       src/shared/syscall-list.h \
+       src/shared/audit.c \
+       src/shared/audit.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -842,14 +844,6 @@ libsystemd_capability_la_CFLAGS = \
 libsystemd_capability_la_LIBADD = \
        $(CAP_LIBS)
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-audit.la
-
-libsystemd_audit_la_SOURCES = \
-       src/shared/audit.c \
-       src/shared/audit.h
-
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -1013,7 +1007,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-audit.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libudev-internal.la \
@@ -1957,6 +1950,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-container.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
+       src/libsystemd-bus/bus-creds.c \
+       src/libsystemd-bus/bus-creds.h \
        src/libsystemd-bus/bus-signature.c \
        src/libsystemd-bus/bus-signature.h \
        src/libsystemd-bus/bus-type.c \
@@ -2035,6 +2030,7 @@ tests += \
        test-bus-introspect \
        test-bus-objects \
        test-bus-error \
+       test-bus-creds \
        test-event
 
 bin_PROGRAMS += \
@@ -2119,6 +2115,17 @@ test_bus_error_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_bus_creds_SOURCES = \
+       src/libsystemd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la \
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la
+
 test_bus_match_SOURCES = \
        src/libsystemd-bus/test-bus-match.c
 
@@ -2961,6 +2968,12 @@ test_journal_stream_SOURCES = \
 test_journal_stream_LDADD = \
        libsystemd-journal-core.la
 
+test_journal_flush_SOURCES = \
+       src/journal/test-journal-flush.c
+
+test_journal_flush_LDADD = \
+       libsystemd-journal-core.la
+
 test_journal_init_SOURCES = \
        src/journal/test-journal-init.c
 
@@ -3080,7 +3093,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \
 libsystemd_journal_core_la_LIBADD = \
        libsystemd-journal-internal.la \
        libudev-internal.la \
-       libsystemd-audit.la \
        libsystemd-capability.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
@@ -3167,6 +3179,7 @@ tests += \
        test-journal-init \
        test-journal-verify \
        test-journal-interleaving \
+       test-journal-flush \
        test-mmap-cache \
        test-catalog
 
@@ -3205,6 +3218,7 @@ pkgconfiglib_DATA += \
 
 dist_catalog_DATA = \
        catalog/systemd-fr.catalog \
+       catalog/systemd-ru.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3770,7 +3784,6 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-audit.la \
        libsystemd-daemon-internal.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
@@ -3833,6 +3846,7 @@ systemd_networkd_SOURCES = \
        src/network/networkd.h \
        src/network/networkd.c \
        src/network/networkd-link.c \
+       src/network/networkd-bridge.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -3843,6 +3857,7 @@ nodist_systemd_networkd_SOURCES = \
 
 systemd_networkd_LDADD = \
        libudev-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-rtnl.la \
@@ -3858,6 +3873,7 @@ test_network_SOURCES = \
        src/network/test-network.c \
        src/network/networkd.h \
        src/network/networkd-link.c \
+       src/network/networkd-bridge.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -3922,7 +3938,6 @@ libsystemd_logind_core_la_SOURCES = \
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-audit.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-bus-internal.la \
@@ -4062,7 +4077,6 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
-       libsystemd-audit.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
@@ -4127,6 +4141,8 @@ MULTI_USER_TARGET_WANTS += \
 SYSTEM_UNIT_ALIASES += \
        systemd-logind.service dbus-org.freedesktop.login1.service
 
+if ENABLE_MULTI_SEAT_X
+
 systemd_multi_seat_x_SOURCES = \
        src/login/multi-seat-x.c
 
@@ -4137,6 +4153,8 @@ systemd_multi_seat_x_LDADD = \
 rootlibexec_PROGRAMS += \
        systemd-multi-seat-x
 
+endif
+
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
        src/login/70-power-switch.rules