userpresetdir=$(prefix)/lib/systemd/user-preset
tmpfilesdir=$(prefix)/lib/tmpfiles.d
sysctldir=$(prefix)/lib/sysctl.d
-linkdir=$(prefix)/lib/net/links
+networkdir=$(prefix)/lib/systemd/network
pkgincludedir=$(includedir)/systemd
systemgeneratordir=$(rootlibexecdir)/system-generators
usergeneratordir=$(prefix)/lib/systemd/user-generators
-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)
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
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/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 \
CLEANFILES += \
units/console-shell.service.m4 \
units/console-getty.service.m4 \
+ units/container-getty@.service.m4 \
units/rescue.service.m4
if HAVE_SYSV_COMPAT
make-directive-index.py \
xml_helper.py
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+ libsystemd-rtnl.la
+
+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-util.h \
+ src/libsystemd-rtnl/rtnl-util.c
+
+test_rtnl_SOURCES = \
+ src/libsystemd-rtnl/test-rtnl.c
+
+test_rtnl_LDADD = \
+ libsystemd-shared.la \
+ libsystemd-rtnl.la
+
+tests += test-rtnl
+
# ------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
libsystemd-shared.la
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
#-------------------------------------------------------------------------------
noinst_LTLIBRARIES += \
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 \
$(sysconfdir)/udev/rules.d \
$(sysconfdir)/udev/hwdb.d
+dist_network_DATA = \
+ network/99-default.link
+
dist_udevrules_DATA += \
rules/99-systemd.rules \
rules/42-usb-hid-pm.rules \
rules/75-net-description.rules \
rules/75-tty-description.rules \
rules/78-sound-card.rules \
- rules/80-net-name-slot.rules \
- rules/85-net-configure-link.rules \
+ rules/80-net-setup-link.rules \
rules/95-udev-late.rules
dist_udevhwdb_DATA = \
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 \
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
libsystemd-label.la \
libsystemd-daemon-internal.la \
libsystemd-shared.la \
+ libsystemd-rtnl.la \
+ libsystemd-id128-internal.la \
$(BLKID_LIBS) \
$(KMOD_LIBS)
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 += \
timedatectl_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la
+ libsystemd-bus.la
bin_PROGRAMS += \
timedatectl
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)
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
machinectl_LDADD = \
libsystemd-shared.la \
- libsystemd-dbus.la \
- libudev.la
+ libsystemd-bus.la
rootbin_PROGRAMS += \
machinectl
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
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 \