X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=37ea845ed433bd6e92466a6f6d20ca4b30e8732a;hb=1c7dd82563ff2e71a067aea20d2acb2d0553644b;hp=20f760c5b694aeda15bac2ae242910a8eab375bd;hpb=f299e3e430a26188106ce15abf05f3ae7e54ef59;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 20f760c5b..37ea845ed 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -368,6 +368,7 @@ bin_PROGRAMS = \
 	systemd-delta \
 	systemd-analyze \
 	systemd-run \
+	systemd-stdio-bridge \
 	systemd-path
 
 dist_bin_SCRIPTS = \
@@ -391,7 +392,6 @@ rootlibexec_PROGRAMS = \
 	systemd-sysctl \
 	systemd-sleep \
 	systemd-bus-proxyd \
-	systemd-stdio-bridge \
 	systemd-socket-proxyd \
 	systemd-update-done
 
@@ -2692,6 +2692,10 @@ libsystemd_proxy_la_SOURCES = \
 	src/bus-proxyd/synthesize.c \
 	src/bus-proxyd/synthesize.h
 
+libsystemd_proxy_la_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
 libsystemd_proxy_la_LIBADD = \
 	libsystemd-internal.la \
 	libsystemd-shared.la
@@ -2699,6 +2703,10 @@ libsystemd_proxy_la_LIBADD = \
 systemd_bus_proxyd_SOURCES = \
 	src/bus-proxyd/bus-proxyd.c
 
+systemd_bus_proxyd_CFLAGS = \
+	$(AM_CFLAGS) \
+	-pthread
+
 systemd_bus_proxyd_LDADD = \
 	libsystemd-proxy.la \
 	libsystemd-internal.la \
@@ -2714,24 +2722,24 @@ systemd_stdio_bridge_LDADD = \
 
 if ENABLE_KDBUS
 nodist_systemunit_DATA += \
-	units/systemd-bus-proxyd@.service
+	units/systemd-bus-proxyd.service
 
 dist_systemunit_DATA += \
 	units/systemd-bus-proxyd.socket
 
 nodist_userunit_DATA += \
-	units/user/systemd-bus-proxyd@.service
+	units/user/systemd-bus-proxyd.service
 
 dist_userunit_DATA += \
 	units/user/systemd-bus-proxyd.socket
 endif
 
 EXTRA_DIST += \
-	units/systemd-bus-proxyd@.service.m4.in \
-	units/user/systemd-bus-proxyd@.service.in
+	units/systemd-bus-proxyd.service.m4.in \
+	units/user/systemd-bus-proxyd.service.in
 
 CLEANFILES += \
-	units/systemd-bus-proxyd@.service.m4
+	units/systemd-bus-proxyd.service.m4
 
 if HAVE_SMACK
 bus-proxyd-set-cap-hook:
@@ -5277,6 +5285,7 @@ test_qcow2_CFLAGS = \
 
 test_qcow2_LDADD = \
 	libsystemd-internal.la \
+	libsystemd-label.la \
 	libsystemd-shared.la \
 	$(ZLIB_LIBS)
 endif