X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=f4b19589a1b1c6f7d5938bdb6ef5d629a9fc90a6;hp=7bedd76f397e55af0bd775e164db1aba94a9d97b;hb=b67f541f130cd4c55da0b74af5fcbb4daeca1937;hpb=bc25a2fb66ebf14589bb7ce5ecbd35301ee484ac diff --git a/Makefile.am b/Makefile.am index 7bedd76f3..f4b19589a 100644 --- 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 @@ -1349,10 +1350,9 @@ test_cgroup_LDADD = \ test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c -test_cgroup_mask_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) \ - -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" +test_cgroup_mask_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" test_cgroup_mask_LDADD = \ libsystemd-core.la \ @@ -1416,9 +1416,9 @@ test_watchdog_LDADD = \ test_sched_prio_SOURCES = \ src/test/test-sched-prio.c -test_sched_prio_CFLAGS = \ - $(AM_CFLAGS) \ - -D"STR(s)=\#s" -D"TEST_DIR=STR($(abs_top_srcdir)/test/)" +test_sched_prio_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DTEST_DIR=\"$(abs_top_srcdir)/test\" test_sched_prio_LDADD = \ libsystemd-core.la \ @@ -1562,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 \ @@ -1901,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 @@ -2009,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 \ @@ -2027,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) @@ -2048,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 += \ @@ -2162,11 +2189,15 @@ test_bus_gvariant_LDADD = \ libsystemd-id128-internal.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ - $(GLIB_LIBS) + libsystemd-bus-dump.la \ + libsystemd-capability.la \ + $(GLIB_LIBS) \ + $(CAP_LIBS) test_bus_gvariant_CFLAGS = \ $(AM_CFLAGS) \ $(GLIB_CFLAGS) + $(CAP_CFLAGS) test_bus_creds_SOURCES = \ src/libsystemd-bus/test-bus-creds.c @@ -2393,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 \ @@ -2947,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 @@ -3054,8 +3089,8 @@ test_mmap_cache_LDADD = \ test_catalog_SOURCES = \ src/journal/test-catalog.c -test_catalog_CFLAGS = \ - $(AM_CFLAGS) \ +test_catalog_CPPFLAGS = \ + $(AM_CPPFLAGS) \ -DCATALOG_DIR=\"$(abs_top_srcdir)/catalog\" test_catalog_LDADD = \ @@ -3313,9 +3348,12 @@ systemd_journal_gatewayd_LDADD = \ systemd_journal_gatewayd_CFLAGS = \ $(AM_CFLAGS) \ - -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" \ $(MICROHTTPD_CFLAGS) +systemd_journal_gatewayd_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + -DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\" + dist_systemunit_DATA += \ units/systemd-journal-gatewayd.socket @@ -3681,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 = \ @@ -3836,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 = \ @@ -3960,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 \ @@ -4902,3 +5010,6 @@ tests += \ test-libsystemd-journal-sym \ test-libsystemd-login-sym \ test-libudev-sym + +cppcheck: + cppcheck --enable=all $(top_srcdir)