X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=e9b80bf11613928049e201e30881e0efb4d128b1;hp=6ce4b7fffa4e52dfb35a4a47891a4b998e247ee0;hb=5f34246c751504d505fbbe57d49148beea74edbe;hpb=65f568bbeb9b8c70200e44c19a797df3a0bfd485 diff --git a/Makefile.am b/Makefile.am index 6ce4b7fff..e9b80bf11 100644 --- 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 -linkdir=$(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,9 @@ 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 #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -1944,6 +1953,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,6 +2225,9 @@ INSTALL_DIRS += \ $(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 \ @@ -2228,8 +2242,7 @@ dist_udevrules_DATA += \ 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 = \ @@ -2310,11 +2323,12 @@ 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 \ 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 @@ -2344,6 +2358,8 @@ libudev_core_la_LIBADD = \ libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-shared.la \ + libsystemd-rtnl.la \ + libsystemd-id128-internal.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) @@ -3507,12 +3523,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 += \ @@ -3573,13 +3588,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 += \ @@ -3641,7 +3652,7 @@ timedatectl_CFLAGS = \ timedatectl_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la + libsystemd-bus.la bin_PROGRAMS += \ timedatectl @@ -3684,9 +3695,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) @@ -3700,16 +3708,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 @@ -3725,8 +3729,7 @@ machinectl_CFLAGS = \ machinectl_LDADD = \ libsystemd-shared.la \ - libsystemd-dbus.la \ - libudev.la + libsystemd-bus.la rootbin_PROGRAMS += \ machinectl @@ -3734,10 +3737,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 @@ -4488,8 +4487,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 \