sd-bus: make sure we properly handle NULL callback functions

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 637f5e15c5225fc6411eba3c723987667aca0d80..6379262ca3ca58b843098408318f11d8b61f46af 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -801,6 +801,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/clean-ipc.c \
        src/shared/login-shared.c \
        src/shared/login-shared.h \
+       src/shared/ring.c \
+       src/shared/ring.h \
        src/shared/async.c \
        src/shared/async.h
 
@@ -1198,6 +1200,7 @@ tests += \
        test-utf8 \
        test-ellipsize \
        test-util \
+       test-ring \
        test-tmpfiles \
        test-namespace \
        test-date \
@@ -1325,6 +1328,12 @@ test_util_SOURCES = \
 test_util_LDADD = \
        libsystemd-core.la
 
+test_ring_SOURCES = \
+       src/test/test-ring.c
+
+test_ring_LDADD = \
+       libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
        src/test/test-tmpfiles.c
 
@@ -2110,6 +2119,8 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-bus/bus-track.h \
        src/libsystemd/sd-bus/bus-util.c \
        src/libsystemd/sd-bus/bus-util.h \
+       src/libsystemd/sd-bus/bus-slot.c \
+       src/libsystemd/sd-bus/bus-slot.h \
        src/libsystemd/sd-bus/bus-protocol.h \
        src/libsystemd/sd-bus/kdbus.h \
        src/libsystemd/sd-bus/sd-memfd.c \
@@ -3671,6 +3682,19 @@ nodist_systemunit_DATA += \
        units/systemd-readahead-replay.service \
        units/systemd-readahead-done.service
 
+manual_tests += \
+       test-ssd
+
+test_ssd_SOURCES = \
+       src/readahead/test-ssd.c \
+       src/readahead/readahead-common.c \
+       src/readahead/readahead-common.h
+
+test_ssd_LDADD = \
+       libsystemd-internal.la \
+       libudev-internal.la \
+       libsystemd-shared.la
+
 endif
 
 EXTRA_DIST += \
@@ -4171,7 +4195,8 @@ systemd_networkd_SOURCES = \
        src/network/networkd.c
 
 systemd_networkd_LDADD = \
-       libsystemd-networkd-core.la
+       libsystemd-networkd-core.la \
+       -lkmod
 
 noinst_LTLIBRARIES += \
        libsystemd-networkd-core.la
@@ -4181,6 +4206,7 @@ libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd.h \
        src/network/networkd-link.c \
        src/network/networkd-netdev.c \
+       src/network/networkd-tunnel.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
@@ -4217,13 +4243,15 @@ systemd_networkd_wait_online_LDADD = \
        libsystemd-network.la \
        libudev-internal.la \
        libsystemd-internal.la \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-network.la
 
 test_network_SOURCES = \
        src/network/test-network.c
 
 test_network_LDADD = \
-       libsystemd-networkd-core.la
+       libsystemd-networkd-core.la \
+       -lkmod
 
 tests += \
        test-network