X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=b337f4f09b8be515903e7604fa5971acd51dbb40;hb=66a4c743c070761ee8696aa6302445fecf358441;hp=287718413b513f1769734373a8a781ec7411bcbc;hpb=912b54ad47e1597c1744ccd936368b0eb1468b16;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 287718413..b337f4f09 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -300,7 +300,7 @@ bin_PROGRAMS = \
 	systemd-delta \
 	systemd-analyze \
 	systemd-run \
-	systemd-sabridge
+	systemd-saproxy
 
 dist_bin_SCRIPTS = \
 	src/kernel-install/kernel-install
@@ -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 \
@@ -2956,6 +2959,7 @@ test_catalog_LDADD = \
 libsystemd_journal_la_SOURCES = \
 	src/journal/sd-journal.c \
 	src/systemd/sd-journal.h \
+	src/systemd/_sd-common.h \
 	src/journal/journal-file.c \
 	src/journal/journal-file.h \
 	src/journal/journal-vacuum.c \
@@ -3119,7 +3123,8 @@ tests += \
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
-	src/systemd/sd-messages.h
+	src/systemd/sd-messages.h \
+	src/systemd/_sd-common.h
 
 lib_LTLIBRARIES += \
 	libsystemd-journal.la
@@ -3210,10 +3215,10 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 
-systemd_sabridge_SOURCES = \
-	src/sabridge/sabridge.c
+systemd_saproxy_SOURCES = \
+	src/saproxy/saproxy.c
 
-systemd_sabridge_LDADD = \
+systemd_saproxy_LDADD = \
 	libsystemd-shared.la \
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
@@ -3221,7 +3226,7 @@ systemd_sabridge_LDADD = \
 	libsystemd-daemon.la \
 	libsystemd-bus.la
 
-systemd_sabridge_CFLAGS = \
+systemd_saproxy_CFLAGS = \
 	$(AM_CFLAGS)
 
 # ------------------------------------------------------------------------------
@@ -3506,15 +3511,11 @@ if ENABLE_HOSTNAMED
 systemd_hostnamed_SOURCES = \
 	src/hostname/hostnamed.c
 
-systemd_hostnamed_CFLAGS = \
-	$(AM_CFLAGS) \
-	$(DBUS_CFLAGS)
-
 systemd_hostnamed_LDADD = \
 	libsystemd-label.la \
 	libsystemd-shared.la \
 	libsystemd-daemon.la \
-	libsystemd-dbus.la
+	libsystemd-bus.la
 
 rootlibexec_PROGRAMS += \
 	systemd-hostnamed
@@ -3655,15 +3656,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