X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=acf511bc4f8aa8054691af23e63d5a5c593e87b7;hp=06106357884e9b701a4cfcc0e8d25684a828b0d8;hb=53ab52ac6d2a12ba24f3cfd618c12c99871947ed;hpb=1b16c75cd2da6741824e9843135f55e3b5d23d9d

diff --git a/Makefile.am b/Makefile.am
index 061063578..acf511bc4 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)
 
@@ -2002,7 +2004,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 \
@@ -3248,9 +3251,9 @@ pkgconfiglib_DATA += \
 	src/journal/libsystemd-journal.pc
 
 dist_catalog_DATA = \
-	catalog/systemd-fr.catalog \
-	catalog/systemd-ru.catalog \
-	catalog/systemd-it.catalog \
+	catalog/systemd.fr.catalog \
+	catalog/systemd.ru.catalog \
+	catalog/systemd.it.catalog \
 	catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3615,6 +3618,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 +3633,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 +3677,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 +3695,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 +3757,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 +3770,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 +3871,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 +3886,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
 
@@ -4137,7 +4162,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 +4199,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 = \
@@ -4608,6 +4637,7 @@ SYSTEM_UNIT_ALIASES += \
 USER_UNIT_ALIASES += \
 	$(systemunitdir)/shutdown.target shutdown.target \
 	$(systemunitdir)/sockets.target sockets.target \
+	$(systemunitdir)/busnames.target busnames.target \
 	$(systemunitdir)/timers.target timers.target \
 	$(systemunitdir)/paths.target paths.target \
 	$(systemunitdir)/bluetooth.target bluetooth.target \
@@ -4674,7 +4704,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 += \