X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=caee5c93df93da5af5dd5d9f241372cbb839b012;hp=de42424912d9ca39d0015126555eb5925598381c;hb=ab2bc6feee7022cea057f8e00f513f7dba962c74;hpb=682265d5e2157882861b0091c6b81fa92699b72a diff --git a/Makefile.am b/Makefile.am index de4242491..caee5c93d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -43,6 +43,12 @@ LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 +LIBSYSTEMD_CURRENT=3 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=3 + +# The following four libraries only exist for compatibility reasons, +# their version info should not be bumped anymore LIBSYSTEMD_LOGIN_CURRENT=9 LIBSYSTEMD_LOGIN_REVISION=3 LIBSYSTEMD_LOGIN_AGE=9 @@ -59,10 +65,6 @@ LIBSYSTEMD_JOURNAL_CURRENT=11 LIBSYSTEMD_JOURNAL_REVISION=5 LIBSYSTEMD_JOURNAL_AGE=11 -LIBSYSTEMD_CURRENT=2 -LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=2 - # Dirs of external packages dbuspolicydir=@dbuspolicydir@ dbussessionservicedir=@dbussessionservicedir@ @@ -86,6 +88,7 @@ pkgsysconfdir=$(sysconfdir)/systemd userunitdir=$(prefix)/lib/systemd/user userpresetdir=$(prefix)/lib/systemd/user-preset tmpfilesdir=$(prefix)/lib/tmpfiles.d +sysusersdir=$(prefix)/lib/sysusers.d sysctldir=$(prefix)/lib/sysctl.d networkdir=$(rootprefix)/lib/systemd/network pkgincludedir=$(includedir)/systemd @@ -294,10 +297,14 @@ define install-relative-aliases done endef +install-touch-usr-hook: + touch -c $(DESTDIR)/$(prefix) + INSTALL_EXEC_HOOKS += \ install-target-wants-hook \ install-directories-hook \ - install-aliases-hook + install-aliases-hook \ + install-touch-usr-hook # ------------------------------------------------------------------------------ AM_V_M4 = $(AM_V_M4_$(V)) @@ -358,12 +365,14 @@ rootlibexec_PROGRAMS = \ systemd-sysctl \ systemd-sleep \ systemd-bus-proxyd \ - systemd-socket-proxyd + systemd-socket-proxyd \ + systemd-update-done systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ - systemd-system-update-generator + systemd-system-update-generator \ + systemd-debug-generator dist_bashcompletion_DATA = \ shell-completion/bash/busctl \ @@ -413,6 +422,7 @@ dist_systemunit_DATA = \ units/remote-fs.target \ units/remote-fs-pre.target \ units/network.target \ + units/network-pre.target \ units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ @@ -455,7 +465,8 @@ dist_systemunit_DATA = \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ units/system-update.target \ - units/initrd-switch-root.target + units/initrd-switch-root.target \ + units/ldconfig.service nodist_systemunit_DATA = \ units/getty@.service \ @@ -486,12 +497,14 @@ nodist_systemunit_DATA = \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service \ units/debug-shell.service \ units/initrd-parse-etc.service \ units/initrd-cleanup.service \ units/initrd-udevadm-cleanup-db.service \ units/initrd-switch-root.service \ - units/systemd-nspawn@.service + units/systemd-nspawn@.service \ + units/systemd-update-done.service dist_userunit_DATA = \ units/user/basic.target \ @@ -501,6 +514,9 @@ dist_userunit_DATA = \ nodist_userunit_DATA = \ units/user/systemd-exit.service +dist_systempreset_DATA = \ + system-preset/90-systemd.preset + EXTRA_DIST += \ units/getty@.service.m4 \ units/serial-getty@.service.m4 \ @@ -534,7 +550,8 @@ EXTRA_DIST += \ units/initrd-cleanup.service.in \ units/initrd-udevadm-cleanup-db.service.in \ units/initrd-switch-root.service.in \ - units/systemd-nspawn@.service.in + units/systemd-nspawn@.service.in \ + units/systemd-update-done.service.in CLEANFILES += \ units/console-shell.service.m4 \ @@ -549,6 +566,7 @@ nodist_systemunit_DATA += \ units/halt-local.service systemgenerator_PROGRAMS += \ + systemd-sysv-generator \ systemd-rc-local-generator endif @@ -807,7 +825,9 @@ libsystemd_shared_la_SOURCES = \ src/shared/async.c \ src/shared/async.h \ src/shared/eventfd-util.c \ - src/shared/eventfd-util.h + src/shared/eventfd-util.h \ + src/shared/copy.c \ + src/shared/copy.h nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ @@ -1221,7 +1241,9 @@ tests += \ test-tables \ test-device-nodes \ test-xml \ - test-architecture + test-architecture \ + test-socket-util \ + test-fdset EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1325,12 +1347,24 @@ test_utf8_SOURCES = \ test_utf8_LDADD = \ libsystemd-shared.la +test_fdset_SOURCES = \ + src/test/test-fdset.c + +test_fdset_LDADD = \ + libsystemd-core.la + test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ libsystemd-core.la +test_socket_util_SOURCES = \ + src/test/test-socket-util.c + +test_socket_util_LDADD = \ + libsystemd-core.la + test_ring_SOURCES = \ src/test/test-ring.c @@ -1633,6 +1667,14 @@ systemd_update_utmp_LDADD = \ libsystemd-shared.la \ $(AUDIT_LIBS) +# ------------------------------------------------------------------------------ +systemd_update_done_SOURCES = \ + src/update-done/update-done.c + +systemd_update_done_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_shutdownd_SOURCES = \ src/shutdownd/shutdownd.c @@ -1722,7 +1764,9 @@ dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/tmp.conf \ - tmpfiles.d/x11.conf + tmpfiles.d/x11.conf \ + tmpfiles.d/var.conf \ + tmpfiles.d/etc.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1749,6 +1793,38 @@ EXTRA_DIST += \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in +# ------------------------------------------------------------------------------ +if ENABLE_SYSUSERS +systemd_sysusers_SOURCES = \ + src/sysusers/sysusers.c + +systemd_sysusers_LDADD = \ + libsystemd-units.la \ + libsystemd-label.la \ + libsystemd-capability.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +rootbin_PROGRAMS += \ + systemd-sysusers + +nodist_systemunit_DATA += \ + units/systemd-sysusers.service + +SYSINIT_TARGET_WANTS += \ + systemd-sysusers.service + +nodist_sysusers_DATA = \ + sysusers.d/systemd.conf + +EXTRA_DIST += \ + units/systemd-sysusers.service.in \ + sysusers.d/systemd.conf.in + +INSTALL_DIRS += \ + $(sysusersdir) +endif + # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup/machine-id-setup-main.c \ @@ -1816,6 +1892,14 @@ systemd_getty_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_debug_generator_SOURCES = \ + src/debug-generator/debug-generator.c + +systemd_debug_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_fstab_generator_SOURCES = \ src/fstab-generator/fstab-generator.c \ @@ -1914,6 +1998,15 @@ INSTALL_EXEC_HOOKS += dbus1-generator-install-hook UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook endif +# ------------------------------------------------------------------------------ +systemd_sysv_generator_SOURCES = \ + src/sysv-generator/sysv-generator.c + +systemd_sysv_generator_LDADD = \ + libsystemd-core.la \ + libsystemd-label.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ systemd_rc_local_generator_SOURCES = \ src/rc-local-generator/rc-local-generator.c @@ -2030,9 +2123,12 @@ systemd_run_LDADD = \ # ------------------------------------------------------------------------------ systemd_bus_proxyd_SOURCES = \ - src/bus-proxyd/bus-proxyd.c + src/bus-proxyd/bus-proxyd.c \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h systemd_bus_proxyd_LDADD = \ + libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2488,15 +2584,18 @@ libsystemd_network_la_CFLAGS = \ libsystemd_network_la_SOURCES = \ src/systemd/sd-network.h \ src/systemd/sd-dhcp-client.h \ + src/systemd/sd-dhcp-server.h \ src/systemd/sd-dhcp-lease.h \ src/systemd/sd-ipv4ll.h \ src/network/sd-network.c \ src/network/network-util.h \ src/libsystemd-network/sd-dhcp-client.c \ + src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ src/libsystemd-network/dhcp-option.c \ src/libsystemd-network/dhcp-packet.c \ src/libsystemd-network/dhcp-internal.h \ + src/libsystemd-network/dhcp-server-internal.h \ src/libsystemd-network/dhcp-protocol.h \ src/libsystemd-network/dhcp-lease-internal.h \ src/libsystemd-network/sd-dhcp-lease.c \ @@ -2505,7 +2604,17 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/ipv4ll-packet.c \ src/libsystemd-network/ipv4ll-internal.h \ src/libsystemd-network/network-internal.c \ - src/libsystemd-network/network-internal.h + src/libsystemd-network/network-internal.h \ + src/systemd/sd-icmp6-nd.h \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-dhcp6-lease.h \ + src/libsystemd-network/sd-icmp6-nd.c \ + src/libsystemd-network/sd-dhcp6-client.c \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/dhcp6-network.c \ + src/libsystemd-network/dhcp6-option.c \ + src/libsystemd-network/dhcp6-lease-internal.h \ + src/libsystemd-network/sd-dhcp6-lease.c libsystemd_network_la_LIBADD = \ libudev-internal.la \ @@ -2536,6 +2645,14 @@ test_dhcp_client_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_dhcp_server_SOURCES = \ + src/libsystemd-network/test-dhcp-server.c + +test_dhcp_server_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + test_ipv4ll_SOURCES = \ src/systemd/sd-ipv4ll.h \ src/libsystemd-network/ipv4ll-internal.h \ @@ -2547,10 +2664,34 @@ test_ipv4ll_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_icmp6_rs_SOURCES = \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-icmp6-nd.h \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/test-icmp6-rs.c + +test_icmp6_rs_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +test_dhcp6_client_SOURCES = \ + src/systemd/sd-dhcp6-client.h \ + src/libsystemd-network/dhcp6-internal.h \ + src/libsystemd-network/test-dhcp6-client.c + +test_dhcp6_client_LDADD = \ + libsystemd-network.la \ + libsystemd-internal.la \ + libsystemd-shared.la + tests += \ test-dhcp-option \ test-dhcp-client \ - test-ipv4ll + test-dhcp-server \ + test-ipv4ll \ + test-icmp6-rs \ + test-dhcp6-client # ------------------------------------------------------------------------------ if ENABLE_GTK_DOC @@ -2697,19 +2838,23 @@ CLEANFILES += \ EXTRA_DIST += \ units/systemd-udevd.service.in \ units/systemd-udev-trigger.service.in \ - units/systemd-udev-settle.service.in + units/systemd-udev-settle.service.in \ + units/systemd-udev-hwdb-update.service.in CLEANFILES += \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ - units/systemd-udev-settle.service + units/systemd-udev-settle.service \ + units/systemd-udev-hwdb-update.service SOCKETS_TARGET_WANTS += \ systemd-udevd-control.socket \ systemd-udevd-kernel.socket + SYSINIT_TARGET_WANTS += \ systemd-udevd.service \ - systemd-udev-trigger.service + systemd-udev-trigger.service \ + systemd-udev-hwdb-update.service rootbin_PROGRAMS += \ udevadm @@ -3434,7 +3579,7 @@ libsystemd_journal_internal_la_SOURCES = \ src/journal/mmap-cache.h # using _CFLAGS = in the conditional below would suppress AM_CFLAGS -libsystemd_journal_internal_la_CFLAGS = +libsystemd_journal_internal_la_CFLAGS = \ $(AM_CFLAGS) libsystemd_journal_internal_la_LIBADD = @@ -3479,11 +3624,13 @@ bin_PROGRAMS += \ systemd-cat dist_systemunit_DATA += \ - units/systemd-journald.socket + units/systemd-journald.socket \ + units/systemd-journald-dev-log.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ - units/systemd-journal-flush.service + units/systemd-journal-flush.service \ + units/systemd-journal-catalog-update.service dist_pkgsysconf_DATA += \ src/journal/journald.conf @@ -3495,14 +3642,18 @@ dist_catalog_DATA = \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ - systemd-journald.socket + systemd-journald.socket \ + systemd-journald-dev-log.socket + SYSINIT_TARGET_WANTS += \ systemd-journald.service \ - systemd-journal-flush.service + systemd-journal-flush.service \ + systemd-journal-catalog-update.service EXTRA_DIST += \ units/systemd-journald.service.in \ units/systemd-journal-flush.service.in \ + units/systemd-journal-catalog-update.service.in \ src/journal/journald-gperf.gperf CLEANFILES += \ @@ -3563,7 +3714,8 @@ systemd_socket_proxyd_LDADD = \ libsystemd-logs.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + libsystemd-resolve.la # ------------------------------------------------------------------------------ if ENABLE_COREDUMP @@ -3576,25 +3728,42 @@ systemd_coredump_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +if HAVE_ELFUTILS +systemd_coredump_SOURCES += \ + src/journal/stacktrace.c \ + src/journal/stacktrace.h + +systemd_coredump_LDADD += \ + $(ELFUTILS_LIBS) +endif + rootlibexec_PROGRAMS += \ systemd-coredump -systemd_coredumpctl_SOURCES = \ +dist_pkgsysconf_DATA += \ + src/journal/coredump.conf + +if HAVE_ACL +systemd_coredump_LDADD += \ + libsystemd-acl.la +endif + +coredumpctl_SOURCES = \ src/journal/coredumpctl.c -systemd_coredumpctl_LDADD = \ +coredumpctl_LDADD = \ libsystemd-journal-internal.la \ libsystemd-internal.la \ libsystemd-shared.la bin_PROGRAMS += \ - systemd-coredumpctl + coredumpctl dist_bashcompletion_DATA += \ - shell-completion/bash/systemd-coredumpctl + shell-completion/bash/coredumpctl dist_zshcompletion_DATA += \ - shell-completion/zsh/_systemd-coredumpctl + shell-completion/zsh/_coredumpctl sysctl_DATA = \ sysctl.d/50-coredump.conf @@ -3823,7 +3992,8 @@ systemgenerator_PROGRAMS += \ systemd-cryptsetup-generator dist_systemunit_DATA += \ - units/cryptsetup.target + units/cryptsetup.target \ + units/cryptsetup-pre.target systemd_cryptsetup_SOURCES = \ src/cryptsetup/cryptsetup.c @@ -4269,10 +4439,12 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-netdev.c \ src/network/networkd-tunnel.c \ src/network/networkd-veth.c \ + src/network/networkd-vxlan.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ - src/network/networkd-manager.c + src/network/networkd-manager.c \ + src/network/networkd-address-pool.c nodist_libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-network-gperf.c \ @@ -4320,7 +4492,7 @@ nodist_systemunit_DATA += \ GENERAL_ALIASES += \ $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-networkd.service \ - $(systemunitdir)/systemd-networkd.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service + $(systemunitdir)/systemd-networkd-wait-online.service $(pkgsysconfdir)/system/network-online.target.wants/systemd-networkd-wait-online.service EXTRA_DIST += \ src/network/networkd-network-gperf.gperf \ @@ -4856,6 +5028,7 @@ substitutions = \ '|udevrulesdir=$(udevrulesdir)|' \ '|catalogdir=$(catalogdir)|' \ '|tmpfilesdir=$(tmpfilesdir)|' \ + '|sysusersdir=$(sysusersdir)|' \ '|sysctldir=$(sysctldir)|' \ '|systemgeneratordir=$(systemgeneratordir)|' \ '|usergeneratordir=$(usergeneratordir)|' \ @@ -4887,7 +5060,8 @@ substitutions = \ '|NTP_SERVERS=$(NTP_SERVERS)|' \ '|DNS_SERVERS=$(DNS_SERVERS)|' \ '|systemuidmax=$(SYSTEM_UID_MAX)|' \ - '|systemgidmax=$(SYSTEM_GID_MAX)|' + '|systemgidmax=$(SYSTEM_GID_MAX)|' \ + '|TTY_GID=$(TTY_GID)|' SED_PROCESS = \ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ @@ -5049,14 +5223,20 @@ RUNLEVEL4_TARGET_WANTS += \ RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service endif + SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service + systemd-update-utmp.service \ + systemd-update-done.service \ + ldconfig.service + LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ tmp.mount + MULTI_USER_TARGET_WANTS += \ getty.target \ systemd-ask-password-wall.path + SYSINIT_TARGET_WANTS += \ dev-hugepages.mount \ dev-mqueue.mount \