X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=25bbcab888bff43ed8e55e66579ee18ef8a1c6eb;hp=f238d85200d6842f7136e214411769a41a06706e;hb=d514feaa872820d5cb4e9321ad32673c09fbb3f4;hpb=a6e9f2b911ce13618b3f0fcd3d23ecb6471e07ba diff --git a/Makefile.am b/Makefile.am index f238d8520..25bbcab88 100644 --- a/Makefile.am +++ b/Makefile.am @@ -219,6 +219,7 @@ LOCAL_FS_TARGET_WANTS = MULTI_USER_TARGET_WANTS = SYSINIT_TARGET_WANTS = SOCKETS_TARGET_WANTS = +BUSNAMES_TARGET_WANTS = TIMERS_TARGET_WANTS = SYSTEM_UNIT_ALIASES = @@ -237,6 +238,7 @@ install-target-wants-hook: what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && $(add-wants) what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants) what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants) + what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && $(add-wants) what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants) what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants) @@ -650,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 += \ @@ -1347,10 +1351,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 \ @@ -1414,9 +1417,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 \ @@ -1995,6 +1998,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-introspect.h \ src/libsystemd-bus/bus-objects.c \ src/libsystemd-bus/bus-objects.h \ + src/libsystemd-bus/bus-gvariant.c \ + src/libsystemd-bus/bus-gvariant.h \ src/libsystemd-bus/bus-convenience.c \ src/libsystemd-bus/kdbus.h \ src/libsystemd-bus/sd-memfd.c \ @@ -2002,7 +2007,8 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-util.h \ src/libsystemd-bus/sd-utf8.c \ src/libsystemd-bus/sd-event.c \ - src/libsystemd-bus/event-util.h + src/libsystemd-bus/event-util.h \ + src/libsystemd-bus/bus-protocol.h libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ @@ -2022,7 +2028,9 @@ pkgconfiglib_DATA += \ src/libsystemd-bus/libsystemd-bus.pc EXTRA_DIST += \ - src/libsystemd-bus/libsystemd-bus.pc.in + src/libsystemd-bus/libsystemd-bus.pc.in \ + src/libsystemd-bus/DIFFERENCES \ + src/libsystemd-bus/GVARIANT-SERIALIZATION lib_LTLIBRARIES += \ libsystemd-bus.la @@ -2062,6 +2070,7 @@ tests += \ test-bus-objects \ test-bus-error \ test-bus-creds \ + test-bus-gvariant \ test-event bin_PROGRAMS += \ @@ -2146,6 +2155,24 @@ test_bus_error_LDADD = \ libsystemd-daemon-internal.la \ libsystemd-shared.la +test_bus_gvariant_SOURCES = \ + src/libsystemd-bus/test-bus-gvariant.c + +test_bus_gvariant_LDADD = \ + libsystemd-bus-internal.la \ + libsystemd-id128-internal.la \ + libsystemd-daemon-internal.la \ + libsystemd-shared.la \ + 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 @@ -2925,7 +2952,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 @@ -3032,8 +3061,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 = \ @@ -3291,9 +3320,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 @@ -3615,6 +3647,9 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-hostnamed.service +dist_systemunit_DATA += \ + units/org.freedesktop.hostname1.busname + dist_dbuspolicy_DATA += \ src/hostname/org.freedesktop.hostname1.conf @@ -3627,6 +3662,9 @@ polkitpolicy_files += \ SYSTEM_UNIT_ALIASES += \ systemd-hostnamed.service dbus-org.freedesktop.hostname1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.hostname1.busname + hostnamectl_SOURCES = \ src/hostname/hostnamectl.c @@ -3668,6 +3706,9 @@ systemd_localed_LDADD = \ nodist_systemunit_DATA += \ units/systemd-localed.service +dist_systemunit_DATA += \ + units/org.freedesktop.locale1.busname + rootlibexec_PROGRAMS += \ systemd-localed @@ -3683,6 +3724,9 @@ polkitpolicy_files += \ SYSTEM_UNIT_ALIASES += \ systemd-localed.service dbus-org.freedesktop.locale1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.locale1.busname + dist_pkgdata_DATA += \ src/locale/kbd-model-map @@ -3742,6 +3786,9 @@ dist_dbuspolicy_DATA += \ nodist_systemunit_DATA += \ units/systemd-timedated.service +dist_systemunit_DATA += \ + units/org.freedesktop.timedate1.busname + polkitpolicy_files += \ src/timedate/org.freedesktop.timedate1.policy @@ -3752,6 +3799,9 @@ INSTALL_DIRS += \ SYSTEM_UNIT_ALIASES += \ systemd-timedated.service dbus-org.freedesktop.timedate1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.timedate1.busname + timedatectl_SOURCES = \ src/timedate/timedatectl.c @@ -3850,7 +3900,8 @@ nodist_systemunit_DATA += \ units/systemd-machined.service dist_systemunit_DATA += \ - units/machine.slice + units/machine.slice \ + units/org.freedesktop.machine1.busname dist_dbussystemservice_DATA += \ src/machine/org.freedesktop.machine1.service @@ -3864,6 +3915,9 @@ dist_zshcompletion_DATA += \ SYSTEM_UNIT_ALIASES += \ systemd-machined.service dbus-org.freedesktop.machine1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.machine1.busname + EXTRA_DIST += \ units/systemd-machined.service.in @@ -3916,10 +3970,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 \ @@ -4137,7 +4193,8 @@ nodist_systemunit_DATA += \ units/systemd-user-sessions.service dist_systemunit_DATA += \ - units/user.slice + units/user.slice \ + units/org.freedesktop.login1.busname dist_dbussystemservice_DATA += \ src/login/org.freedesktop.login1.service @@ -4173,6 +4230,9 @@ MULTI_USER_TARGET_WANTS += \ SYSTEM_UNIT_ALIASES += \ systemd-logind.service dbus-org.freedesktop.login1.service +BUSNAMES_TARGET_WANTS += \ + org.freedesktop.login1.busname + if ENABLE_MULTI_SEAT_X systemd_multi_seat_x_SOURCES = \ @@ -4675,7 +4735,8 @@ DISTCHECK_CONFIGURE_FLAGS = \ --with-pamlibdir=$$dc_install_base/$(pamlibdir) \ --with-pamconfdir=$$dc_install_base/$(pamconfdir) \ --with-rootprefix=$$dc_install_base \ - --disable-split-usr + --disable-split-usr \ + --enable-kdbus if HAVE_SYSV_COMPAT DISTCHECK_CONFIGURE_FLAGS += \