bus: when connecting to a container's kdbus instance, enter namespace first

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5828ae19a3240a42edf6ada53df124bf3bb522a5..ca4c5f87c25d7f731550f6fbc511b64dd6679383 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -798,9 +798,6 @@ libsystemd_units_la_SOURCES = \
        src/shared/specifier.c \
        src/shared/specifier.h
 
-libsystemd_units_la_CFLAGS = \
-       $(AM_CFLAGS)
-
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
        libsystemd-label.la
@@ -1563,11 +1560,10 @@ EXTRA_DIST += \
 # ------------------------------------------------------------------------------
 if ENABLE_TMPFILES
 systemd_tmpfiles_SOURCES = \
-       src/tmpfiles/tmpfiles.c \
-       src/shared/specifier.c \
-       src/shared/specifier.h
+       src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-capability.la \
        libsystemd-id128-internal.la \
@@ -1902,6 +1898,22 @@ bus-proxyd-uninstall-hook:
 
 INSTALL_EXEC_HOOKS += bus-proxyd-install-hook
 UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook
+
+nodist_systemunit_DATA += \
+       units/systemd-bus-proxyd@.service
+
+dist_systemunit_DATA += \
+       units/systemd-bus-proxyd.socket
+
+dist_userunit_DATA += \
+       units/user/systemd-bus-proxyd.socket
+
+USER_UNIT_ALIASES += \
+       $(systemunitdir)/systemd-bus-proxyd@.service systemd-bus-proxyd@.service
+
+EXTRA_DIST += \
+       units/systemd-bus-proxyd@.service.in
+
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -2049,7 +2061,7 @@ libsystemd_bus_dump_la_SOURCES = \
        src/libsystemd-bus/bus-dump.h
 
 libsystemd_bus_dump_la_CFLAGS = \
-       $(AM_CFLAGS)
+       $(AM_CFLAGS) \
        $(CAP_CFLAGS)
 
 noinst_LTLIBRARIES += \
@@ -3858,34 +3870,29 @@ libsystemd_dhcp_la_SOURCES = \
 noinst_LTLIBRARIES += \
        libsystemd-dhcp.la
 
-libsystemd_dhcp_la_CFLAGS = \
-       $(AM_CFLAGS)
-
-libsystemd_dhcp_la_LDFLAGS = \
-       $(AM_LDFLAGS)
-
 libsystemd_dhcp_la_LIBADD = \
-       libsystemd-shared.la
+       libsystemd-shared.la \
+       libsystemd-bus.la
 
 test_dhcp_option_SOURCES = \
        src/libsystemd-dhcp/dhcp-protocol.h \
        src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/dhcp-option.c \
        src/libsystemd-dhcp/test-dhcp-option.c
 
 test_dhcp_option_LDADD = \
+       libsystemd-dhcp.la \
        libsystemd-shared.la
 
 test_dhcp_client_SOURCES = \
        src/libsystemd-dhcp/dhcp-protocol.h \
        src/systemd/sd-dhcp-client.h \
-       src/libsystemd-dhcp/dhcp-client.c \
        src/libsystemd-dhcp/dhcp-internal.h \
-       src/libsystemd-dhcp/dhcp-option.c \
        src/libsystemd-dhcp/test-dhcp-client.c
 
 test_dhcp_client_LDADD = \
-       libsystemd-shared.la
+       libsystemd-dhcp.la \
+       libsystemd-shared.la \
+       libsystemd-bus.la
 
 tests += \
        test-dhcp-option \