busctl: port over to use bus_open_transport()

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 4a96a500575a54faaf5a49e5662e9951dcb14617..ed618847e85156d109b264f5822dfc887f2a2fe6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -83,7 +83,7 @@ userunitdir=$(prefix)/lib/systemd/user
 userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysctldir=$(prefix)/lib/sysctl.d
-linksdir=$(prefix)/lib/net/links
+networkdir=$(prefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
 usergeneratordir=$(prefix)/lib/systemd/user-generators
@@ -183,6 +183,7 @@ AM_CPPFLAGS = \
        -I $(top_srcdir)/src/udev/net \
        -I $(top_builddir)/src/udev \
        -I $(top_srcdir)/src/libsystemd-bus \
+       -I $(top_srcdir)/src/libsystemd-rtnl \
        $(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -343,6 +344,7 @@ dist_zshcompletion_DATA = \
        shell-completion/zsh/_kernel-install \
        shell-completion/zsh/_systemd-nspawn \
        shell-completion/zsh/_systemd-analyze \
+       shell-completion/zsh/_systemd-run \
        shell-completion/zsh/_sd_hosts_or_user_at_host \
        shell-completion/zsh/_systemd-delta \
        shell-completion/zsh/_systemd
@@ -416,6 +418,7 @@ nodist_systemunit_DATA = \
        units/serial-getty@.service \
        units/console-shell.service \
        units/console-getty.service \
+       units/container-getty@.service \
        units/systemd-initctl.service \
        units/systemd-shutdownd.service \
        units/systemd-remount-fs.service \
@@ -458,6 +461,7 @@ EXTRA_DIST += \
        units/serial-getty@.service.m4 \
        units/console-shell.service.m4.in \
        units/console-getty.service.m4.in \
+       units/container-getty@.service.m4.in \
        units/rescue.service.m4.in \
        units/systemd-initctl.service.in \
        units/systemd-shutdownd.service.in \
@@ -493,6 +497,7 @@ EXTRA_DIST += \
 CLEANFILES += \
        units/console-shell.service.m4 \
        units/console-getty.service.m4 \
+       units/container-getty@.service.m4 \
        units/rescue.service.m4
 
 if HAVE_SYSV_COMPAT
@@ -627,7 +632,9 @@ libsystemd_rtnl_la_SOURCES = \
        src/systemd/sd-rtnl.h \
        src/libsystemd-rtnl/sd-rtnl.c \
        src/libsystemd-rtnl/rtnl-internal.h \
-       src/libsystemd-rtnl/rtnl-message.c
+       src/libsystemd-rtnl/rtnl-message.c \
+       src/libsystemd-rtnl/rtnl-util.h \
+       src/libsystemd-rtnl/rtnl-util.c
 
 test_rtnl_SOURCES = \
        src/libsystemd-rtnl/test-rtnl.c
@@ -741,7 +748,11 @@ libsystemd_shared_la_SOURCES = \
        src/shared/apparmor-util.c \
        src/shared/apparmor-util.h \
        src/shared/ima-util.c \
-       src/shared/ima-util.h
+       src/shared/ima-util.h \
+       src/shared/ptyfwd.c \
+       src/shared/ptyfwd.h \
+       src/shared/net-util.c \
+       src/shared/net-util.h
 
 #-------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -749,11 +760,7 @@ noinst_LTLIBRARIES += \
 
 libsystemd_dbus_la_SOURCES = \
        src/shared/dbus-common.c \
-       src/shared/dbus-common.h \
-       src/shared/dbus-loop.c \
-       src/shared/dbus-loop.h \
-       src/shared/polkit.c \
-       src/shared/polkit.h
+       src/shared/dbus-common.h
 
 libsystemd_dbus_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1944,6 +1951,8 @@ libsystemd_bus_la_SOURCES = \
        src/libsystemd-bus/bus-socket.h \
        src/libsystemd-bus/bus-kernel.c \
        src/libsystemd-bus/bus-kernel.h \
+       src/libsystemd-bus/bus-container.c \
+       src/libsystemd-bus/bus-container.h \
        src/libsystemd-bus/bus-message.c \
        src/libsystemd-bus/bus-message.h \
        src/libsystemd-bus/bus-signature.c \
@@ -2214,13 +2223,14 @@ INSTALL_DIRS += \
        $(sysconfdir)/udev/rules.d \
        $(sysconfdir)/udev/hwdb.d
 
-dist_links_DATA = \
-       links/99-default.link
+dist_network_DATA = \
+       network/99-default.link
 
 dist_udevrules_DATA += \
        rules/99-systemd.rules \
        rules/42-usb-hid-pm.rules \
        rules/50-udev-default.rules \
+       rules/60-drm.rules \
        rules/60-keyboard.rules \
        rules/60-persistent-storage-tape.rules \
        rules/60-persistent-serial.rules \
@@ -2231,7 +2241,7 @@ dist_udevrules_DATA += \
        rules/75-net-description.rules \
        rules/75-tty-description.rules \
        rules/78-sound-card.rules \
-       rules/85-net-configure-link.rules \
+       rules/80-net-setup-link.rules \
        rules/95-udev-late.rules
 
 dist_udevhwdb_DATA = \
@@ -2312,7 +2322,7 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-input_id.c \
        src/udev/udev-builtin-keyboard.c \
        src/udev/udev-builtin-net_id.c \
-       src/udev/udev-builtin-net_link.c \
+       src/udev/udev-builtin-net_setup_link.c \
        src/udev/udev-builtin-path_id.c \
        src/udev/udev-builtin-usb_id.c \
        src/udev/net/link-config.h \
@@ -2347,6 +2357,7 @@ libudev_core_la_LIBADD = \
        libsystemd-daemon-internal.la \
        libsystemd-shared.la \
        libsystemd-rtnl.la \
+       libsystemd-id128-internal.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
 
@@ -3509,13 +3520,9 @@ SYSTEM_UNIT_ALIASES += \
 hostnamectl_SOURCES = \
        src/hostname/hostnamectl.c
 
-hostnamectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 hostnamectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
@@ -3576,13 +3583,9 @@ update-kbd-model-map: src/locale/generate-kbd-model-map
 localectl_SOURCES = \
        src/locale/localectl.c
 
-localectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 localectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
@@ -3644,7 +3647,7 @@ timedatectl_CFLAGS = \
 
 timedatectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la
+       libsystemd-bus.la
 
 bin_PROGRAMS += \
        timedatectl
@@ -3687,9 +3690,6 @@ systemd_machined_SOURCES = \
        src/machine/machined.c \
        src/machine/machined.h
 
-systemd_machined_CFLAGS = \
-       $(libsystemd_machine_core_la_CFLAGS)
-
 systemd_machined_LDADD = \
        libsystemd-machine-core.la \
        $(libsystemd_machine_core_la_LIBADD)
@@ -3703,16 +3703,12 @@ libsystemd_machine_core_la_SOURCES = \
        src/machine/machine.h \
        src/machine/machine-dbus.c
 
-libsystemd_machine_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 libsystemd_machine_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-audit.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        libsystemd-id128-internal.la \
        libudev.la
 
@@ -3728,8 +3724,7 @@ machinectl_CFLAGS = \
 
 machinectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
-       libudev.la
+       libsystemd-bus.la
 
 rootbin_PROGRAMS += \
        machinectl
@@ -3737,10 +3732,6 @@ rootbin_PROGRAMS += \
 test_machine_tables_SOURCES = \
        src/machine/test-machine-tables.c
 
-test_machine_tables_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 test_machine_tables_LDADD = \
        libsystemd-machine-core.la
 
@@ -3779,9 +3770,6 @@ systemd_logind_SOURCES = \
 nodist_systemd_logind_SOURCES = \
        src/login/logind-gperf.c
 
-systemd_logind_CFLAGS = \
-       $(libsystemd_logind_core_la_CFLAGS)
-
 systemd_logind_LDADD = \
        libsystemd-logind-core.la \
        $(libsystemd_logind_core_la_LIBADD)
@@ -3812,17 +3800,13 @@ libsystemd_logind_core_la_SOURCES = \
        src/login/login-shared.c \
        src/login/login-shared.h
 
-libsystemd_logind_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
-
 libsystemd_logind_core_la_LIBADD = \
        libsystemd-label.la \
        libsystemd-audit.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
-       libsystemd-dbus.la \
        libsystemd-id128-internal.la \
+       libsystemd-bus.la \
        libudev.la
 
 if HAVE_ACL
@@ -3902,11 +3886,7 @@ test_inhibit_SOURCES = \
 
 test_inhibit_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la
-
-test_inhibit_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       libsystemd-bus.la
 
 test_login_tables_SOURCES = \
        src/login/test-login-tables.c
@@ -4491,8 +4471,8 @@ endif
 INSTALL_DIRS += \
        $(prefix)/lib/modules-load.d \
        $(sysconfdir)/modules-load.d \
-       $(prefix)/lib/net/links \
-       $(sysconfdir)/net/links \
+       $(prefix)/lib/systemd/network \
+       $(sysconfdir)/systemd/network \
        $(prefix)/lib/sysctl.d \
        $(sysconfdir)/sysctl.d \
        $(prefix)/lib/kernel/install.d \