chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: never report nodes as children that do not have the right prefix
[elogind.git]
/
Makefile.am
diff --git
a/Makefile.am
b/Makefile.am
index a06a79b958759f2e43ab659c28be3c8959457385..e29439d8cc28c5d619ae2d44584b5912ce0fb4a0 100644
(file)
--- a/
Makefile.am
+++ b/
Makefile.am
@@
-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/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)
$(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/_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
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/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 \
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/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 \
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 \
CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
+ units/container-getty@.service.m4 \
units/rescue.service.m4
if HAVE_SYSV_COMPAT
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/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
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/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 += \
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
@@
-749,11
+760,7
@@
noinst_LTLIBRARIES += \
libsystemd_dbus_la_SOURCES = \
src/shared/dbus-common.c \
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) \
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-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 \
src/libsystemd-bus/bus-message.c \
src/libsystemd-bus/bus-message.h \
src/libsystemd-bus/bus-signature.c \
@@
-2221,6
+2230,7
@@
dist_udevrules_DATA += \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/50-udev-default.rules \
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 \
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/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
- rules/8
5-net-configure
-link.rules \
+ rules/8
0-net-setup
-link.rules \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
@@
-2317,7
+2327,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/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
src/udev/net/ethtool-util.h \
src/udev/net/ethtool-util.c
@@
-3512,12
+3521,11
@@
hostnamectl_SOURCES = \
src/hostname/hostnamectl.c
hostnamectl_CFLAGS = \
src/hostname/hostnamectl.c
hostnamectl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
+ $(AM_CFLAGS)
hostnamectl_LDADD = \
libsystemd-shared.la \
hostnamectl_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la
bin_PROGRAMS += \
libsystemd-id128-internal.la
bin_PROGRAMS += \
@@
-3578,13
+3586,9
@@
update-kbd-model-map: src/locale/generate-kbd-model-map
localectl_SOURCES = \
src/locale/localectl.c
localectl_SOURCES = \
src/locale/localectl.c
-localectl_CFLAGS = \
- $(AM_CFLAGS) \
- $(DBUS_CFLAGS)
-
localectl_LDADD = \
libsystemd-shared.la \
localectl_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la
bin_PROGRAMS += \
libsystemd-id128-internal.la
bin_PROGRAMS += \
@@
-3646,7
+3650,7
@@
timedatectl_CFLAGS = \
timedatectl_LDADD = \
libsystemd-shared.la \
timedatectl_LDADD = \
libsystemd-shared.la \
- libsystemd-
d
bus.la
+ libsystemd-bus.la
bin_PROGRAMS += \
timedatectl
bin_PROGRAMS += \
timedatectl
@@
-3689,9
+3693,6
@@
systemd_machined_SOURCES = \
src/machine/machined.c \
src/machine/machined.h
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)
systemd_machined_LDADD = \
libsystemd-machine-core.la \
$(libsystemd_machine_core_la_LIBADD)
@@
-3705,16
+3706,12
@@
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.h \
src/machine/machine-dbus.c
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_machine_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-
d
bus.la \
+ libsystemd-bus.la \
libsystemd-id128-internal.la \
libudev.la
libsystemd-id128-internal.la \
libudev.la
@@
-3730,8
+3727,7
@@
machinectl_CFLAGS = \
machinectl_LDADD = \
libsystemd-shared.la \
machinectl_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
- libudev.la
+ libsystemd-bus.la
rootbin_PROGRAMS += \
machinectl
rootbin_PROGRAMS += \
machinectl
@@
-3739,10
+3735,6
@@
rootbin_PROGRAMS += \
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
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
test_machine_tables_LDADD = \
libsystemd-machine-core.la
@@
-3815,16
+3807,15
@@
libsystemd_logind_core_la_SOURCES = \
src/login/login-shared.h
libsystemd_logind_core_la_CFLAGS = \
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_logind_core_la_LIBADD = \
libsystemd-label.la \
libsystemd-audit.la \
libsystemd-shared.la \
libsystemd-daemon.la \
- libsystemd-dbus.la \
libsystemd-id128-internal.la \
libsystemd-id128-internal.la \
+ libsystemd-bus.la \
libudev.la
if HAVE_ACL
libudev.la
if HAVE_ACL