From 40ca29a1370379d43e44c0ed425eecc7218dcbca Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 16 Oct 2013 06:10:04 +0200 Subject: timedated: use libsystemd-bus instead of libdbus for bus communication Among other things this also adds a few things necessary for the change: - Considerably more powerful error returning APIs in libsystemd-bus - Adapter for connecting an sd_bus to an sd_event - As I reworked the PolicyKit logic to the new library I also made it asynchronous, so that PolicyKit requests of one user cannot block out another user anymore. - We always use the macro names for common bus error. That way it is harder to mistype them since the compiler will notice --- Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index 59c5174268..ba27a348b8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1983,7 +1983,10 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-convenience.c \ src/libsystemd-bus/kdbus.h \ src/libsystemd-bus/sd-memfd.c \ - src/libsystemd-bus/sd-event.c + src/libsystemd-bus/sd-event.c \ + src/libsystemd-bus/bus-util.c \ + src/libsystemd-bus/bus-util.h \ + src/libsystemd-bus/event-util.h libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ @@ -3655,15 +3658,11 @@ if ENABLE_TIMEDATED systemd_timedated_SOURCES = \ src/timedate/timedated.c -systemd_timedated_CFLAGS = \ - $(AM_CFLAGS) \ - $(DBUS_CFLAGS) - systemd_timedated_LDADD = \ libsystemd-label.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-dbus.la + libsystemd-bus.la rootlibexec_PROGRAMS += \ systemd-timedated -- cgit v1.2.3-54-g00ecf