rename stdio-bridge to bus-proxyd

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0119751c4447cf450dba110d19ed0d204103067f..adf92c03d3fec4d979ab021a0f5372b1783188cf 100644 (file)
--- 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 = \
@@ -769,7 +769,9 @@ libsystemd_shared_la_SOURCES = \
        src/shared/errno-list.c \
        src/shared/errno-list.h \
        src/shared/syscall-list.c \
-       src/shared/syscall-list.h
+       src/shared/syscall-list.h \
+       src/shared/audit.c \
+       src/shared/audit.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -842,14 +844,6 @@ libsystemd_capability_la_CFLAGS = \
 libsystemd_capability_la_LIBADD = \
        $(CAP_LIBS)
 
-# ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libsystemd-audit.la
-
-libsystemd_audit_la_SOURCES = \
-       src/shared/audit.c \
-       src/shared/audit.h
-
 # ------------------------------------------------------------------------------
 if HAVE_ACL
 noinst_LTLIBRARIES += \
@@ -1013,7 +1007,6 @@ libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
        libsystemd-units.la \
        libsystemd-label.la \
-       libsystemd-audit.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
        libudev-internal.la \
@@ -1866,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
@@ -1957,6 +1958,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-container.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
+       src/libsystemd-bus/bus-creds.c \
+       src/libsystemd-bus/bus-creds.h \
        src/libsystemd-bus/bus-signature.c \
        src/libsystemd-bus/bus-signature.h \
        src/libsystemd-bus/bus-type.c \
@@ -2035,6 +2038,7 @@ tests += \
        test-bus-introspect \
        test-bus-objects \
        test-bus-error \
+       test-bus-creds \
        test-event
 
 bin_PROGRAMS += \
@@ -2119,6 +2123,17 @@ test_bus_error_LDADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la
 
+test_bus_creds_SOURCES = \
+       src/libsystemd-bus/test-bus-creds.c
+
+test_bus_creds_LDADD = \
+       libsystemd-bus-internal.la \
+       libsystemd-id128-internal.la \
+       libsystemd-daemon-internal.la \
+       libsystemd-shared.la \
+       libsystemd-bus-dump.la \
+       libsystemd-capability.la
+
 test_bus_match_SOURCES = \
        src/libsystemd-bus/test-bus-match.c
 
@@ -3086,7 +3101,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \
 libsystemd_journal_core_la_LIBADD = \
        libsystemd-journal-internal.la \
        libudev-internal.la \
-       libsystemd-audit.la \
        libsystemd-capability.la \
        libsystemd-label.la \
        libsystemd-daemon-internal.la \
@@ -3212,6 +3226,7 @@ pkgconfiglib_DATA += \
 
 dist_catalog_DATA = \
        catalog/systemd-fr.catalog \
+       catalog/systemd-ru.catalog \
        catalog/systemd.catalog
 
 SOCKETS_TARGET_WANTS += \
@@ -3777,7 +3792,6 @@ libsystemd_machine_core_la_SOURCES = \
 
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
-       libsystemd-audit.la \
        libsystemd-daemon-internal.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
@@ -3932,7 +3946,6 @@ libsystemd_logind_core_la_SOURCES = \
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-capability.la \
-       libsystemd-audit.la \
        libsystemd-daemon-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-bus-internal.la \
@@ -4072,7 +4085,6 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
-       libsystemd-audit.la \
        libsystemd-bus-internal.la \
        libsystemd-id128-internal.la \
        libsystemd-daemon-internal.la \
@@ -4137,6 +4149,8 @@ MULTI_USER_TARGET_WANTS += \
 SYSTEM_UNIT_ALIASES += \
        systemd-logind.service dbus-org.freedesktop.login1.service
 
+if ENABLE_MULTI_SEAT_X
+
 systemd_multi_seat_x_SOURCES = \
        src/login/multi-seat-x.c
 
@@ -4147,6 +4161,8 @@ systemd_multi_seat_x_LDADD = \
 rootlibexec_PROGRAMS += \
        systemd-multi-seat-x
 
+endif
+
 dist_udevrules_DATA += \
        src/login/70-uaccess.rules \
        src/login/70-power-switch.rules