summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-02-15 14:54:09 +0100
committerLennart Poettering <lennart@poettering.net>2016-02-15 14:54:09 +0100
commit8eff97a103581750d90c7e0c2f984dc261226ccc (patch)
treea3cb36a7db39448767d62866504e465a8ee1c56e /Makefile.am
parent4d5d9d001105507ee40ff56f0456053c2c7ed6d3 (diff)
parent798c486fbcdce3346cd862c52e1a200bb8a2cb23 (diff)
Merge pull request #2618 from zonque/busproxy-removal
remove bus-proxyd
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am70
1 files changed, 2 insertions, 68 deletions
diff --git a/Makefile.am b/Makefile.am
index da94b502a3..9bc0bf2c05 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -393,7 +393,6 @@ rootlibexec_PROGRAMS = \
systemd-ac-power \
systemd-sysctl \
systemd-sleep \
- systemd-bus-proxyd \
systemd-socket-proxyd \
systemd-update-done
@@ -1467,7 +1466,6 @@ tests += \
test-ratelimit \
test-condition \
test-uid-range \
- test-bus-policy \
test-locale-util \
test-execute \
test-copy \
@@ -1925,14 +1923,11 @@ test_unaligned_SOURCES = \
test_tables_SOURCES = \
src/test/test-tables.c \
src/shared/test-tables.h \
- src/bus-proxyd/bus-xml-policy.c \
- src/bus-proxyd/bus-xml-policy.h \
src/journal/journald-server.c \
src/journal/journald-server.h
test_tables_CPPFLAGS = \
- $(AM_CPPFLAGS) \
- -I$(top_srcdir)/src/bus-proxyd
+ $(AM_CPPFLAGS)
test_tables_CFLAGS = \
$(AM_CFLAGS) \
@@ -2173,13 +2168,6 @@ test_conf_parser_SOURCES = \
test_conf_parser_LDADD = \
libshared.la
-test_bus_policy_SOURCES = \
- src/bus-proxyd/test-bus-xml-policy.c
-
-test_bus_policy_LDADD = \
- libbus-proxy-core.la \
- libshared.la
-
test_af_list_SOURCES = \
src/test/test-af-list.c
@@ -2944,59 +2932,12 @@ systemd_run_LDADD = \
libshared.la
# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
- libbus-proxy-core.la
-
-libbus_proxy_core_la_SOURCES = \
- src/bus-proxyd/bus-xml-policy.c \
- src/bus-proxyd/bus-xml-policy.h \
- src/bus-proxyd/driver.c \
- src/bus-proxyd/driver.h \
- src/bus-proxyd/proxy.c \
- src/bus-proxyd/proxy.h \
- src/bus-proxyd/synthesize.c \
- src/bus-proxyd/synthesize.h
-
-libbus_proxy_core_la_LIBADD = \
- libshared.la
-
-systemd_bus_proxyd_SOURCES = \
- src/bus-proxyd/bus-proxyd.c
-
-systemd_bus_proxyd_LDADD = \
- libbus-proxy-core.la \
- libshared.la
-
systemd_stdio_bridge_SOURCES = \
- src/bus-proxyd/stdio-bridge.c
+ src/stdio-bridge/stdio-bridge.c
systemd_stdio_bridge_LDADD = \
- libbus-proxy-core.la \
libshared.la
-nodist_systemunit_DATA += \
- units/systemd-bus-proxyd.service
-
-dist_systemunit_DATA += \
- units/systemd-bus-proxyd.socket
-
-nodist_userunit_DATA += \
- units/user/systemd-bus-proxyd.service
-
-dist_userunit_DATA += \
- units/user/systemd-bus-proxyd.socket
-
-EXTRA_DIST += \
- units/systemd-bus-proxyd.service.m4.in \
- units/user/systemd-bus-proxyd.service.in
-
-if HAVE_SMACK
-bus-proxyd-set-cap-hook:
- -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
-
-INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
-endif
-
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -3159,7 +3100,6 @@ tests += \
test-bus-cleanup \
test-bus-server \
test-bus-match \
- test-bus-proxy \
test-bus-kernel \
test-bus-kernel-bloom \
test-bus-zero-copy \
@@ -3252,12 +3192,6 @@ test_bus_match_SOURCES = \
test_bus_match_LDADD = \
libshared.la
-test_bus_proxy_SOURCES = \
- src/libsystemd/sd-bus/test-bus-proxy.c
-
-test_bus_proxy_LDADD = \
- libshared.la
-
test_bus_kernel_SOURCES = \
src/libsystemd/sd-bus/test-bus-kernel.c