summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-11-29 21:54:44 +0100
committerKay Sievers <kay@vrfy.org>2013-11-29 22:12:59 +0100
commitf252ff1742947afaf035ae133876a4e767ddeb7c (patch)
tree39c5778d605544a718ca87a9f55cc6f29f9fc160
parent219728b31b853e1ecbf6fd1d61bfdc49d7d07318 (diff)
rename stdio-bridge to bus-proxyd
-rw-r--r--.gitignore2
-rw-r--r--Makefile.am16
l---------src/bus-proxyd/Makefile (renamed from src/stdio-bridge/Makefile)0
-rw-r--r--src/bus-proxyd/bus-proxyd.c (renamed from src/stdio-bridge/stdio-bridge.c)0
4 files changed, 13 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore
index 84c83a556c..19bbceb434 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,7 @@
/systemd-shutdown
/systemd-shutdownd
/systemd-sleep
-/systemd-stdio-bridge
+/systemd-bus-proxyd
/systemd-sysctl
/systemd-system-update-generator
/systemd-timedated
diff --git a/Makefile.am b/Makefile.am
index 3598edd262..adf92c03d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -302,7 +302,6 @@ rootbin_PROGRAMS = \
bin_PROGRAMS = \
systemd-cgls \
systemd-cgtop \
- systemd-stdio-bridge \
systemd-nspawn \
systemd-detect-virt \
systemd-delta \
@@ -329,6 +328,7 @@ rootlibexec_PROGRAMS = \
systemd-ac-power \
systemd-sysctl \
systemd-sleep \
+ systemd-bus-proxyd \
systemd-socket-proxyd
systemgenerator_PROGRAMS = \
@@ -1859,15 +1859,23 @@ systemd_run_LDADD = \
libsystemd-shared.la
# ------------------------------------------------------------------------------
-systemd_stdio_bridge_SOURCES = \
- src/stdio-bridge/stdio-bridge.c
+systemd_bus_proxyd_SOURCES = \
+ src/bus-proxyd/bus-proxyd.c
-systemd_stdio_bridge_LDADD = \
+systemd_bus_proxyd_LDADD = \
libsystemd-bus-internal.la \
libsystemd-daemon-internal.la \
libsystemd-id128-internal.la \
libsystemd-shared.la
+bus-proxyd-install-hook:
+ $(AM_V_LN)$(LN_S) -f ../../lib/systemd/systemd-bus-proxyd $(DESTDIR)$(bindir)/systemd-stdio-bridge
+
+bus-proxyd-uninstall-hook:
+ rm -f $(DESTDIR)$(bindir)/systemd-stdio-bridge
+
+INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
+UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
# ------------------------------------------------------------------------------
systemd_tty_ask_password_agent_SOURCES = \
src/tty-ask-password-agent/tty-ask-password-agent.c
diff --git a/src/stdio-bridge/Makefile b/src/bus-proxyd/Makefile
index d0b0e8e008..d0b0e8e008 120000
--- a/src/stdio-bridge/Makefile
+++ b/src/bus-proxyd/Makefile
diff --git a/src/stdio-bridge/stdio-bridge.c b/src/bus-proxyd/bus-proxyd.c
index 9c49e0ee8d..9c49e0ee8d 100644
--- a/src/stdio-bridge/stdio-bridge.c
+++ b/src/bus-proxyd/bus-proxyd.c