sd-bus: let sd_bus_call() use the synchronous kdbus method

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 96695412a0c05bc7fa0d6775a6325a9886dc1710..e6f411cfecb9b28336afa0a258aee7967a53c55f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -59,9 +59,9 @@ LIBSYSTEMD_JOURNAL_CURRENT=11
 LIBSYSTEMD_JOURNAL_REVISION=3
 LIBSYSTEMD_JOURNAL_AGE=11
 
-LIBSYSTEMD_BUS_CURRENT=0
-LIBSYSTEMD_BUS_REVISION=0
-LIBSYSTEMD_BUS_AGE=0
+LIBSYSTEMD_CURRENT=0
+LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_AGE=0
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -1744,6 +1744,7 @@ systemd_gpt_auto_generator_CFLAGS = \
 endif
 
 # ------------------------------------------------------------------------------
+if ENABLE_KDBUS
 systemgenerator_PROGRAMS +=  \
        systemd-dbus1-generator
 
@@ -1763,6 +1764,7 @@ dbus1-generator-uninstall-hook:
 
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
+endif
 
 # ------------------------------------------------------------------------------
 systemd_rc_local_generator_SOURCES = \
@@ -1982,7 +1984,7 @@ libsystemd_la_SOURCES = \
        src/systemd/sd-event.h \
        src/systemd/sd-dhcp-client.h \
        src/systemd/sd-rtnl.h \
-       src/systemd/sd-resolv.h \
+       src/systemd/sd-resolve.h \
        src/libsystemd/sd-bus.c \
        src/libsystemd/bus-control.c \
        src/libsystemd/bus-control.h \
@@ -2033,8 +2035,8 @@ libsystemd_la_SOURCES = \
        src/libsystemd/rtnl-message.c \
        src/libsystemd/rtnl-util.h \
        src/libsystemd/rtnl-util.c \
-       src/libsystemd/sd-resolv.c \
-       src/libsystemd/resolv-util.h
+       src/libsystemd/sd-resolve.c \
+       src/libsystemd/resolve-util.h
 
 nodist_libsystemd_la_SOURCES = \
        src/libsystemd/bus-error-mapping.c
@@ -2051,7 +2053,7 @@ libsystemd_la_CFLAGS = \
 
 libsystemd_la_LDFLAGS = \
        $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_BUS_CURRENT):$(LIBSYSTEMD_BUS_REVISION):$(LIBSYSTEMD_BUS_AGE) \
+       -version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
        -Wl,--version-script=$(top_srcdir)/src/libsystemd/libsystemd.sym
 
 pkgconfiglib_DATA += \
@@ -2096,6 +2098,7 @@ tests += \
        test-bus-marshal \
        test-bus-signature \
        test-bus-chat \
+       test-bus-cleanup \
        test-bus-server \
        test-bus-match \
        test-bus-kernel \
@@ -2112,7 +2115,7 @@ tests += \
        test-dhcp-option \
        test-dhcp-client \
        test-rtnl \
-       test-resolv
+       test-resolve
 
 bin_PROGRAMS += \
        busctl
@@ -2157,6 +2160,15 @@ test_bus_chat_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_bus_cleanup_SOURCES = \
+       src/libsystemd/test-bus-cleanup.c
+
+test_bus_cleanup_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
 test_bus_server_SOURCES = \
        src/libsystemd/test-bus-server.c
 
@@ -2337,15 +2349,15 @@ test_rtnl_LDADD = \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
 
-test_resolv_SOURCES = \
-       src/systemd/sd-resolv.h \
-       src/libsystemd/test-resolv.c
+test_resolve_SOURCES = \
+       src/systemd/sd-resolve.h \
+       src/libsystemd/test-resolve.c
 
-test_resolv_LDADD = \
+test_resolve_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
-test_resolv_CFLAGS = \
+test_resolve_CFLAGS = \
        $(AM_CFLAGS) \
        -pthread
 
@@ -4916,7 +4928,7 @@ valgrind-tests: $(TESTS)
                if file $$f | grep -q shell; then \
                echo -e "$${x}Skipping non-binary $$f"; else \
                echo -e "$${x}Running $$f"; \
-               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=4194400 --error-exitcode=55 $(builddir)/$$f ; fi; \
+               libtool --mode=execute valgrind -q --leak-check=full --max-stackframe=5242880 --error-exitcode=55 $(builddir)/$$f ; fi; \
                x="\n\n"; \
        done