chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
busctl: show service/session a name belongs to in the list of names
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 19da6eab9597f6c4a9f415cb7672f5cff5d91294..f4b19589a1b1c6f7d5938bdb6ef5d629a9fc90a6 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 += \
@@ -692,6 +694,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/time-util.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
+       src/shared/siphash24.c \
+       src/shared/siphash24.h \
        src/shared/set.c \
        src/shared/set.h \
        src/shared/fdset.c \
@@ -751,8 +755,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/fileio.c \
        src/shared/fileio.h \
        src/shared/output-mode.h \
-       src/shared/MurmurHash3.c \
-       src/shared/MurmurHash3.h \
+       src/shared/MurmurHash2.c \
+       src/shared/MurmurHash2.h \
        src/shared/acpi-fpdt.h \
        src/shared/acpi-fpdt.c \
        src/shared/boot-timestamps.h \
@@ -796,9 +800,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 +1562,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 \
@@ -1900,6 +1900,24 @@ bus-proxyd-uninstall-hook:
 
 INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
 UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+
+if ENABLE_KDBUS
+nodist_systemunit_DATA += \
+       units/systemd-bus-proxyd@.service
+
+dist_systemunit_DATA += \
+       units/systemd-bus-proxyd.socket
+
+dist_userunit_DATA += \
+       units/user/systemd-bus-proxyd.socket
+
+USER_UNIT_ALIASES += \
+       $(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+endif
+
+EXTRA_DIST += \
+       units/systemd-bus-proxyd@.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -2008,6 +2026,9 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/event-util.h \
        src/libsystemd-bus/bus-protocol.h
 
+nodist_libsystemd_bus_la_SOURCES = \
+       src/libsystemd-bus/bus-error-mapping.c
+
 libsystemd_bus_la_LIBADD = \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
@@ -2026,16 +2047,23 @@ pkgconfiglib_DATA += \
        src/libsystemd-bus/libsystemd-bus.pc
 
 EXTRA_DIST += \
+       src/libsystemd-bus/bus-error-mapping.gperf \
        src/libsystemd-bus/libsystemd-bus.pc.in \
        src/libsystemd-bus/DIFFERENCES \
        src/libsystemd-bus/GVARIANT-SERIALIZATION
 
+CLEANFILES += \
+       src/libsystemd-bus/bus-error-mapping.c
+
 lib_LTLIBRARIES += \
        libsystemd-bus.la
 
 libsystemd_bus_internal_la_SOURCES = \
        $(libsystemd_bus_la_SOURCES)
 
+nodist_libsystemd_bus_internal_la_SOURCES = \
+       $(nodist_libsystemd_bus_la_SOURCES)
+
 libsystemd_bus_internal_la_CFLAGS = \
        $(libsystemd_bus_la_CFLAGS)
 
@@ -2047,7 +2075,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 += \
@@ -2396,6 +2424,8 @@ dist_udevhwdb_DATA = \
        hwdb/20-pci-classes.hwdb \
        hwdb/20-usb-vendor-model.hwdb \
        hwdb/20-usb-classes.hwdb \
+       hwdb/20-sdio-vendor-model.hwdb \
+       hwdb/20-sdio-classes.hwdb \
        hwdb/20-bluetooth-vendor-product.hwdb \
        hwdb/20-acpi-vendor.hwdb \
        hwdb/20-OUI.hwdb \
@@ -2950,7 +2980,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
@@ -3687,6 +3719,34 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
        units/systemd-hostnamed.service.in
 
+# ------------------------------------------------------------------------------
+if ENABLE_KDBUS
+systemd_bus_driverd_SOURCES = \
+       src/bus-driverd/bus-driverd.c
+
+systemd_bus_driverd_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la
+
+rootlibexec_PROGRAMS += \
+       systemd-bus-driverd
+
+nodist_systemunit_DATA += \
+       units/systemd-bus-driverd.service
+
+dist_systemunit_DATA += \
+       units/org.freedesktop.DBus.busname
+
+BUSNAMES_TARGET_WANTS += \
+       org.freedesktop.DBus.busname
+
+endif
+
+EXTRA_DIST += \
+       units/systemd-bus-driverd.service.in
+
 # ------------------------------------------------------------------------------
 if ENABLE_LOCALED
 systemd_localed_SOURCES = \
@@ -3842,6 +3902,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 +4066,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 \
@@ -4908,3 +5010,6 @@ tests += \
        test-libsystemd-journal-sym \
        test-libsystemd-login-sym \
        test-libudev-sym
+
+cppcheck:
+       cppcheck --enable=all $(top_srcdir)
Unnamed repository; edit this file 'description' to name the repository.