logind: port logind to libsystemd-bus

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b2d6358002b407945a38ceaf375bb48a736a6b5b..80577e77c33e203fe6e652aa9f115aefef6a9903 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -344,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
@@ -417,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 \
@@ -459,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 \
@@ -494,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
@@ -744,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 += \
@@ -2226,6 +2234,7 @@ 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 \
@@ -2322,7 +2331,6 @@ libudev_core_la_SOURCES = \
        src/udev/udev-builtin-usb_id.c \
        src/udev/net/link-config.h \
        src/udev/net/link-config.c \
-       src/udev/net/link-config-parse.c \
        src/udev/net/ethtool-util.h \
        src/udev/net/ethtool-util.c
 
@@ -3517,12 +3525,11 @@ hostnamectl_SOURCES = \
        src/hostname/hostnamectl.c
 
 hostnamectl_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(AM_CFLAGS)
 
 hostnamectl_LDADD = \
        libsystemd-shared.la \
-       libsystemd-dbus.la \
+       libsystemd-bus.la \
        libsystemd-id128-internal.la
 
 bin_PROGRAMS += \
@@ -3583,13 +3590,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 += \
@@ -3808,16 +3811,15 @@ libsystemd_logind_core_la_SOURCES = \
        src/login/login-shared.h
 
 libsystemd_logind_core_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(DBUS_CFLAGS)
+       $(AM_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