summaryrefslogtreecommitdiff
path: root/Makefile.am
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-10-18 02:40:26 +0200
committerLennart Poettering <lennart@poettering.net>2013-10-18 02:58:47 +0200
commit96c374d0a536286e18cad64d1b5ebb8f07c90334 (patch)
treebc980c411249ef8344c72ada79d84f2ced7672fe /Makefile.am
parente905a456814eadfb904c49241e3841c1e4a1d119 (diff)
socket-proxyd: rename from saproxy
The thing is a daemon, hence needs a "d" prefix. Also, we tend to not abbreviate names of background components unnecessarily, since they are not primary commands people type. Then, the fact that this thing does socket actviation is mostly in implementationd detail for the proxy. Also, do some minor indenting clean-ups and other code updates.
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am15
1 files changed, 6 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 4a399c5236..05f6f90291 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,8 +299,7 @@ bin_PROGRAMS = \
systemd-detect-virt \
systemd-delta \
systemd-analyze \
- systemd-run \
- systemd-saproxy
+ systemd-run
dist_bin_SCRIPTS = \
src/kernel-install/kernel-install
@@ -321,7 +320,8 @@ rootlibexec_PROGRAMS = \
systemd-fsck \
systemd-ac-power \
systemd-sysctl \
- systemd-sleep
+ systemd-sleep \
+ systemd-socket-proxyd
systemgenerator_PROGRAMS = \
systemd-getty-generator \
@@ -3167,10 +3167,10 @@ EXTRA_DIST += \
# ------------------------------------------------------------------------------
-systemd_saproxy_SOURCES = \
- src/saproxy/saproxy.c
+systemd_socket_proxyd_SOURCES = \
+ src/socket-proxy/socket-proxyd.c
-systemd_saproxy_LDADD = \
+systemd_socket_proxyd_LDADD = \
libsystemd-shared.la \
libsystemd-logs.la \
libsystemd-journal-internal.la \
@@ -3178,9 +3178,6 @@ systemd_saproxy_LDADD = \
libsystemd-daemon.la \
libsystemd-bus.la
-systemd_saproxy_CFLAGS = \
- $(AM_CFLAGS)
-
# ------------------------------------------------------------------------------
if ENABLE_COREDUMP
systemd_coredump_SOURCES = \