libsystemd-bus: the same error codes for sd_bus_release_name() (for kdbus and dbus1)

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 19da6eab9597f6c4a9f415cb7672f5cff5d91294..0777d01338d9374d7fd6a92aaa3feb4b7f7a98f5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -652,10 +652,12 @@ test_rtnl_SOURCES = \
 test_rtnl_LDADD = \
        libsystemd-rtnl.la \
        libsystemd-bus-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-shared.la
 
-tests += test-rtnl
+tests += \
+       test-rtnl
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -796,9 +798,6 @@ libsystemd_units_la_SOURCES = \
        src/shared/specifier.c \
        src/shared/specifier.h
 
-libsystemd_units_la_CFLAGS = \
-       $(AM_CFLAGS)
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-label.la
@@ -1561,11 +1560,10 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-       src/tmpfiles/tmpfiles.c \
-       src/shared/specifier.c \
-       src/shared/specifier.h
+       src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-id128-internal.la \
@@ -2047,7 +2045,7 @@ libsystemd_bus_dump_la_SOURCES = \
        src/libsystemd-bus/bus-dump.h
 
 libsystemd_bus_dump_la_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
        $(CAP_CFLAGS)
 
 noinst_LTLIBRARIES += \
@@ -2950,7 +2948,9 @@ systemd_journald_SOURCES = \
        src/journal/journald-server.h
 
 systemd_journald_LDADD = \
-       libsystemd-journal-core.la
+       libsystemd-journal-core.la \
+       libsystemd-bus-internal.la \
+       libsystemd-shared.la
 
 systemd_cat_SOURCES = \
        src/journal/cat.c
@@ -3842,6 +3842,46 @@ lib_LTLIBRARIES += \
        libnss_myhostname.la
 endif
 
+# ------------------------------------------------------------------------------
+libsystemd_dhcp_la_SOURCES = \
+       src/systemd/sd-dhcp-client.h \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/dhcp-network.c \
+       src/libsystemd-dhcp/dhcp-option.c \
+       src/libsystemd-dhcp/dhcp-client.c
+
+noinst_LTLIBRARIES += \
+       libsystemd-dhcp.la
+
+libsystemd_dhcp_la_LIBADD = \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+test_dhcp_option_SOURCES = \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/test-dhcp-option.c
+
+test_dhcp_option_LDADD = \
+       libsystemd-dhcp.la \
+       libsystemd-shared.la
+
+test_dhcp_client_SOURCES = \
+       src/libsystemd-dhcp/dhcp-protocol.h \
+       src/systemd/sd-dhcp-client.h \
+       src/libsystemd-dhcp/dhcp-internal.h \
+       src/libsystemd-dhcp/test-dhcp-client.c
+
+test_dhcp_client_LDADD = \
+       libsystemd-dhcp.la \
+       libsystemd-shared.la \
+       libsystemd-bus.la
+
+tests += \
+       test-dhcp-option \
+       test-dhcp-client
+
 # ------------------------------------------------------------------------------
 if ENABLE_MACHINED
 systemd_machined_SOURCES = \
@@ -3966,10 +4006,12 @@ test_network_LDADD = \
        libudev-internal.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
        libsystemd-rtnl.la \
        libsystemd-shared.la
 
-tests += test-network
+tests += \
+       test-network
 
 EXTRA_DIST += \
        src/network/networkd-gperf.gperf \