X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3b0ba0ae36503338d171b6d32fb98bba289ee132;hp=ce8f2472ee5e20e7422162f57159b07fb095a5e3;hb=14f27b4e3b009d10bb9a3b43b74585c73a7c7626;hpb=de292aa1dd1942e151ff034fcb88504a86742f97 diff --git a/Makefile.am b/Makefile.am index ce8f2472e..3b0ba0ae3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -24,6 +24,9 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} AM_MAKEFLAGS = --no-print-directory AUTOMAKE_OPTIONS = color-tests parallel-tests +GCC_COLORS ?= 'ooh, shiny!' +export GCC_COLORS + SUBDIRS = . po # remove targets if the command fails @@ -35,17 +38,17 @@ SUBDIRS = . po # Keep the test-suite.log .PRECIOUS: $(TEST_SUITE_LOG) Makefile -LIBUDEV_CURRENT=6 +LIBUDEV_CURRENT=7 LIBUDEV_REVISION=0 -LIBUDEV_AGE=5 +LIBUDEV_AGE=6 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 -LIBSYSTEMD_CURRENT=3 -LIBSYSTEMD_REVISION=1 -LIBSYSTEMD_AGE=3 +LIBSYSTEMD_CURRENT=4 +LIBSYSTEMD_REVISION=0 +LIBSYSTEMD_AGE=4 # The following four libraries only exist for compatibility reasons, # their version info should not be bumped anymore @@ -140,6 +143,7 @@ nodist_pkgsysconf_DATA = dist_pkgdata_DATA = dist_dbuspolicy_DATA = dist_dbussystemservice_DATA = +dist_systemunit_DATA_busnames = check_PROGRAMS = check_DATA = tests= @@ -212,6 +216,7 @@ AM_CPPFLAGS = \ -I $(top_srcdir)/src/libsystemd/sd-bus \ -I $(top_srcdir)/src/libsystemd/sd-event \ -I $(top_srcdir)/src/libsystemd/sd-rtnl \ + -I $(top_srcdir)/src/libsystemd/sd-network \ -I $(top_srcdir)/src/libsystemd-network \ -I $(top_srcdir)/src/libsystemd-terminal \ $(OUR_CPPFLAGS) @@ -245,6 +250,7 @@ SOCKETS_TARGET_WANTS = BUSNAMES_TARGET_WANTS = TIMERS_TARGET_WANTS = USER_SOCKETS_TARGET_WANTS = +USER_DEFAULT_TARGET_WANTS = USER_BUSNAMES_TARGET_WANTS = SYSTEM_UNIT_ALIASES = @@ -262,10 +268,13 @@ install-target-wants-hook: what="$(MULTI_USER_TARGET_WANTS)" && wants=multi-user.target && dir=$(systemunitdir) && $(add-wants) what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && dir=$(systemunitdir) && $(add-wants) what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(systemunitdir) && $(add-wants) - what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants) what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && dir=$(systemunitdir) && $(add-wants) what="$(SLICES_TARGET_WANTS)" && wants=slices.target && dir=$(systemunitdir) && $(add-wants) what="$(USER_SOCKETS_TARGET_WANTS)" && wants=sockets.target && dir=$(userunitdir) && $(add-wants) + what="$(USER_DEFAULT_TARGET_WANTS)" && wants=default.target && dir=$(userunitdir) && $(add-wants) + +install-busnames-target-wants-hook: + what="$(BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(systemunitdir) && $(add-wants) what="$(USER_BUSNAMES_TARGET_WANTS)" && wants=busnames.target && dir=$(userunitdir) && $(add-wants) define add-wants @@ -315,6 +324,11 @@ INSTALL_EXEC_HOOKS += \ install-aliases-hook \ install-touch-usr-hook +if ENABLE_KDBUS +INSTALL_EXEC_HOOKS += \ + install-busnames-target-wants-hook +endif + # ------------------------------------------------------------------------------ AM_V_M4 = $(AM_V_M4_$(V)) AM_V_M4_ = $(AM_V_M4_$(AM_DEFAULT_VERBOSITY)) @@ -366,7 +380,6 @@ rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ - systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ systemd-remount-fs \ @@ -379,6 +392,11 @@ rootlibexec_PROGRAMS = \ systemd-socket-proxyd \ systemd-update-done +if HAVE_UTMP +rootlibexec_PROGRAMS += \ + systemd-update-utmp +endif + systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ @@ -450,8 +468,6 @@ dist_systemunit_DATA = \ units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ - units/hibernate.target \ - units/hybrid-sleep.target \ units/poweroff.target \ units/reboot.target \ units/rescue.target \ @@ -463,7 +479,6 @@ dist_systemunit_DATA = \ units/sigpwr.target \ units/sleep.target \ units/sockets.target \ - units/busnames.target \ units/timers.target \ units/paths.target \ units/suspend.target \ @@ -489,8 +504,15 @@ dist_systemunit_DATA = \ units/systemd-udevd-control.socket \ units/systemd-udevd-kernel.socket \ units/system-update.target \ - units/initrd-switch-root.target \ - units/ldconfig.service + units/initrd-switch-root.target + +if ENABLE_KDBUS +dist_systemunit_DATA += \ + $(dist_systemunit_DATA_busnames) +endif + +dist_systemunit_DATA_busnames += \ + units/busnames.target nodist_systemunit_DATA = \ units/getty@.service \ @@ -501,16 +523,12 @@ nodist_systemunit_DATA = \ units/systemd-initctl.service \ units/systemd-shutdownd.service \ units/systemd-remount-fs.service \ - units/systemd-update-utmp.service \ - units/systemd-update-utmp-runlevel.service \ units/systemd-ask-password-wall.service \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ units/emergency.service \ units/rescue.service \ units/user@.service \ - units/systemd-hibernate.service \ - units/systemd-hybrid-sleep.service \ units/systemd-suspend.service \ units/systemd-halt.service \ units/systemd-poweroff.service \ @@ -530,6 +548,12 @@ nodist_systemunit_DATA = \ units/systemd-nspawn@.service \ units/systemd-update-done.service +if HAVE_UTMP +nodist_systemunit_DATA += \ + units/systemd-update-utmp.service \ + units/systemd-update-utmp-runlevel.service +endif + dist_userunit_DATA = \ units/user/basic.target \ units/user/default.target \ @@ -547,7 +571,7 @@ EXTRA_DIST += \ units/console-shell.service.m4.in \ units/console-getty.service.m4.in \ units/container-getty@.service.m4.in \ - units/rescue.service.m4.in \ + units/rescue.service.in \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-remount-fs.service.in \ @@ -566,8 +590,6 @@ EXTRA_DIST += \ units/systemd-fsck-root.service.in \ units/user@.service.in \ units/debug-shell.service.in \ - units/systemd-hibernate.service.in \ - units/systemd-hybrid-sleep.service.in \ units/systemd-suspend.service.in \ units/quotaon.service.in \ units/initrd-parse-etc.service.in \ @@ -581,7 +603,6 @@ CLEANFILES += \ units/console-shell.service.m4 \ units/console-getty.service.m4 \ units/container-getty@.service.m4 \ - units/rescue.service.m4 \ units/user@.service.m4 if HAVE_SYSV_COMPAT @@ -693,7 +714,8 @@ man/systemd.directives.xml: $(top_srcdir)/tools/make-directive-index.py $(SOURCE EXTRA_DIST += \ man/systemd.index.xml \ man/index.html \ - man/systemd.directives.xml + man/systemd.directives.xml \ + man/glib-event-glue.c CLEANFILES += \ man/systemd.index.xml \ @@ -710,7 +732,6 @@ EXTRA_DIST += \ $(man_MANS) \ tools/make-man-index.py \ tools/make-directive-index.py \ - tools/make-man-rules.py \ tools/xml_helper.py # ------------------------------------------------------------------------------ @@ -719,7 +740,6 @@ noinst_LTLIBRARIES += \ libsystemd_shared_la_SOURCES = \ src/shared/linux/auto_dev-ioctl.h \ - src/shared/linux/fanotify.h \ src/shared/ioprio.h \ src/shared/missing.h \ src/shared/initreq.h \ @@ -794,7 +814,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/cgroup-show.h \ src/shared/unit-name.c \ src/shared/unit-name.h \ - src/shared/utmp-wtmp.c \ src/shared/utmp-wtmp.h \ src/shared/watchdog.c \ src/shared/watchdog.h \ @@ -833,6 +852,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/errno-list.h \ src/shared/af-list.c \ src/shared/af-list.h \ + src/shared/arphrd-list.c \ + src/shared/arphrd-list.h \ src/shared/audit.c \ src/shared/audit.h \ src/shared/xml.c \ @@ -858,13 +879,26 @@ libsystemd_shared_la_SOURCES = \ src/shared/copy.h \ src/shared/base-filesystem.c \ src/shared/base-filesystem.h \ + src/shared/memfd.c \ + src/shared/memfd.h \ + src/shared/uid-range.c \ + src/shared/uid-range.h \ + src/shared/switch-root.h \ + src/shared/switch-root.c \ src/shared/nss-util.h +if HAVE_UTMP +libsystemd_shared_la_SOURCES += \ + src/shared/utmp-wtmp.c +endif + nodist_libsystemd_shared_la_SOURCES = \ src/shared/errno-from-name.h \ src/shared/errno-to-name.h \ src/shared/af-from-name.h \ - src/shared/af-to-name.h + src/shared/af-to-name.h \ + src/shared/arphrd-from-name.h \ + src/shared/arphrd-to-name.h libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -914,6 +948,16 @@ libsystemd_label_la_CFLAGS = \ libsystemd_label_la_LIBADD = \ $(SELINUX_LIBS) +# ----------------------------------------------------------------------------- + +if ENABLE_LDCONFIG +dist_systemunit_DATA += \ + units/ldconfig.service + +SYSINIT_TARGET_WANTS += \ + ldconfig.service +endif + # ------------------------------------------------------------------------------ if HAVE_SECCOMP @@ -995,6 +1039,10 @@ libsystemd_core_la_SOURCES = \ src/core/socket.h \ src/core/busname.c \ src/core/busname.h \ + src/core/bus-common.c \ + src/core/bus-common.h \ + src/core/bus-endpoint.c \ + src/core/bus-endpoint.h \ src/core/target.c \ src/core/target.h \ src/core/snapshot.c \ @@ -1087,14 +1135,14 @@ libsystemd_core_la_SOURCES = \ src/core/namespace.h \ src/core/build.h \ src/core/sysfs-show.h \ - src/core/switch-root.h \ - src/core/switch-root.c \ src/core/killall.h \ src/core/killall.c \ src/core/audit-fd.c \ src/core/audit-fd.h \ src/core/show-status.c \ - src/core/show-status.h + src/core/show-status.h \ + src/core/failure-action.c \ + src/core/failure-action.h if HAVE_KMOD libsystemd_core_la_SOURCES += \ @@ -1150,6 +1198,8 @@ CLEANFILES += \ src/shared/errno-from-name.gperf \ src/shared/af-list.txt \ src/shared/af-from-name.gperf \ + src/shared/arphrd-list.txt \ + src/shared/arphrd-from-name.gperf \ src/shared/dns_type-list.txt \ src/shared/dns_type-from-name.gperf @@ -1158,6 +1208,8 @@ BUILT_SOURCES += \ src/shared/errno-to-name.h \ src/shared/af-from-name.h \ src/shared/af-to-name.h \ + src/shared/arphrd-from-name.h \ + src/shared/arphrd-to-name.h \ src/resolve/dns_type-from-name.h \ src/resolve/dns_type-to-name.h @@ -1170,7 +1222,7 @@ BUILT_SOURCES += \ src/shared/errno-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include errno.h - $@ src/shared/errno-to-name.h: src/shared/errno-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const errno_names[] = { "} !/EDEADLOCK/ && !/EWOULDBLOCK/ && !/ENOTSUP/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ @@ -1178,11 +1230,21 @@ src/shared/errno-to-name.h: src/shared/errno-list.txt src/shared/af-list.txt: $(AM_V_at)$(MKDIR_P) $(dir $@) - $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - $@ + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include sys/socket.h - $@ src/shared/af-to-name.h: src/shared/af-list.txt $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const af_names[] = { "} !/AF_FILE/ && !/AF_ROUTE/ && !/AF_LOCAL/ { printf "[%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ +src/shared/arphrd-list.txt: + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include net/if_arp.h - $@ + +src/shared/arphrd-to-name.h: src/shared/arphrd-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "static const char* const arphrd_names[] = { "} !/CISCO/ { printf "[ARPHRD_%s] = \"%s\",\n", $$1, $$1 } END{print "};"}' <$< >$@ + +src/shared/arphrd-from-name.gperf: src/shared/arphrd-list.txt + $(AM_V_GEN)$(AWK) 'BEGIN{ print "struct arphrd_name { const char* name; int id; };"; print "%null-strings"; print "%%";} { printf "%s, ARPHRD_%s\n", $$1, $$1 }' <$< >$@ + src/resolve/dns_type-list.txt: src/resolve/dns-type.h $(AM_V_at)$(MKDIR_P) $(dir $@) @@ -1281,6 +1343,7 @@ tests += \ test-fileio \ test-time \ test-hashmap \ + test-set \ test-list \ test-tables \ test-device-nodes \ @@ -1291,7 +1354,10 @@ tests += \ test-conf-files \ test-capability \ test-async \ - test-ratelimit + test-ratelimit \ + test-condition-util \ + test-uid-range \ + test-bus-policy EXTRA_DIST += \ test/a.service \ @@ -1323,7 +1389,12 @@ EXTRA_DIST += \ test/sysinit.target \ test/testsuite.target \ test/timers.target \ - test/unstoppable.service + test/unstoppable.service \ + test/bus-policy/hello.conf \ + test/bus-policy/methods.conf \ + test/bus-policy/ownerships.conf \ + test/bus-policy/signals.conf + EXTRA_DIST += \ src/test/test-helper.h @@ -1430,6 +1501,14 @@ test_async_SOURCES = \ test_async_LDADD = \ libsystemd-shared.la +test_condition_util_SOURCES = \ + src/test/test-condition-util.c + +test_condition_util_LDADD = \ + libsystemd-shared.la \ + libsystemd-internal.la + + test_fdset_SOURCES = \ src/test/test-fdset.c @@ -1448,6 +1527,12 @@ test_util_SOURCES = \ test_util_LDADD = \ libsystemd-core.la +test_uid_range_SOURCES = \ + src/test/test-uid-range.c + +test_uid_range_LDADD = \ + libsystemd-core.la + test_socket_util_SOURCES = \ src/test/test-socket-util.c @@ -1490,6 +1575,12 @@ test_hashmap_SOURCES = \ test_hashmap_LDADD = \ libsystemd-core.la +test_set_SOURCES = \ + src/test/test-set.c + +test_set_LDADD = \ + libsystemd-core.la + test_xml_SOURCES = \ src/test/test-xml.c @@ -1717,6 +1808,16 @@ test_conf_files_SOURCES = \ test_conf_files_LDADD = \ libsystemd-shared.la +test_bus_policy_SOURCES = \ + src/bus-proxyd/test-bus-policy.c \ + src/bus-proxyd/bus-policy.c \ + src/bus-proxyd/bus-policy.h + +test_bus_policy_LDADD = \ + libsystemd-capability.la \ + libsystemd-internal.la \ + libsystemd-shared.la + # ------------------------------------------------------------------------------ ## .PHONY so it always rebuilds it .PHONY: coverage lcov-run lcov-report coverage-sync @@ -1886,14 +1987,16 @@ nodist_systemunit_DATA += \ units/systemd-tmpfiles-setup.service \ units/systemd-tmpfiles-clean.service +nodist_tmpfiles_DATA = \ + tmpfiles.d/etc.conf + dist_tmpfiles_DATA = \ tmpfiles.d/systemd.conf \ tmpfiles.d/systemd-nologin.conf \ tmpfiles.d/systemd-remote.conf \ tmpfiles.d/tmp.conf \ tmpfiles.d/x11.conf \ - tmpfiles.d/var.conf \ - tmpfiles.d/etc.conf + tmpfiles.d/var.conf if HAVE_SYSV_COMPAT dist_tmpfiles_DATA += \ @@ -1916,10 +2019,14 @@ INSTALL_DIRS += \ endif EXTRA_DIST += \ + tmpfiles.d/etc.conf.m4 \ units/systemd-tmpfiles-setup-dev.service.in \ units/systemd-tmpfiles-setup.service.in \ units/systemd-tmpfiles-clean.service.in +CLEANFILES += \ + tmpfiles.d/etc.conf + # ------------------------------------------------------------------------------ if ENABLE_SYSUSERS systemd_sysusers_SOURCES = \ @@ -1963,9 +2070,11 @@ endif dist_factory_etc_DATA = \ factory/etc/nsswitch.conf +if HAVE_PAM dist_factory_pam_DATA = \ factory/etc/pam.d/system-auth \ factory/etc/pam.d/other +endif # ------------------------------------------------------------------------------ if ENABLE_FIRSTBOOT @@ -2085,8 +2194,45 @@ systemd_system_update_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -if ENABLE_EFI # ------------------------------------------------------------------------------ +if ENABLE_HIBERNATE +systemgenerator_PROGRAMS += \ + systemd-hibernate-resume-generator + +rootlibexec_PROGRAMS += \ + systemd-hibernate-resume + +systemd_hibernate_resume_SOURCES = \ + src/hibernate-resume/hibernate-resume.c + +systemd_hibernate_resume_LDADD = \ + libsystemd-internal.la \ + libsystemd-shared.la + +systemd_hibernate_resume_generator_SOURCES = \ + src/hibernate-resume/hibernate-resume-generator.c + +systemd_hibernate_resume_generator_LDADD = \ + libsystemd-label.la \ + libsystemd-shared.la + +EXTRA_DIST += \ + units/systemd-hibernate.service.in \ + units/systemd-hibernate-resume@.service.in \ + units/systemd-hybrid-sleep.service.in + +dist_systemunit_DATA += \ + units/hibernate.target \ + units/hybrid-sleep.target + +nodist_systemunit_DATA += \ + units/systemd-hibernate.service \ + units/systemd-hibernate-resume@.service \ + units/systemd-hybrid-sleep.service +endif + +# ------------------------------------------------------------------------------ +if ENABLE_EFI systemgenerator_PROGRAMS += \ systemd-efi-boot-generator @@ -2222,8 +2368,7 @@ systemctl_LDADD = \ # ------------------------------------------------------------------------------ systemd_notify_SOURCES = \ - src/notify/notify.c \ - src/readahead/sd-readahead.c + src/notify/notify.c systemd_notify_LDADD = \ libsystemd-internal.la \ @@ -2333,13 +2478,16 @@ nodist_systemunit_DATA += \ dist_systemunit_DATA += \ units/systemd-bus-proxyd.socket -dist_userunit_DATA += \ - units/user/systemd-bus-proxyd.socket \ +nodist_userunit_DATA += \ units/user/systemd-bus-proxyd@.service + +dist_userunit_DATA += \ + units/user/systemd-bus-proxyd.socket endif EXTRA_DIST += \ - units/systemd-bus-proxyd@.service.in + units/systemd-bus-proxyd@.service.in \ + units/user/systemd-bus-proxyd@.service.in # ------------------------------------------------------------------------------ systemd_tty_ask_password_agent_SOURCES = \ @@ -2354,7 +2502,6 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ - src/systemd/sd-memfd.h \ src/systemd/sd-utf8.h \ src/systemd/sd-event.h \ src/systemd/sd-rtnl.h \ @@ -2363,6 +2510,7 @@ libsystemd_internal_la_SOURCES = \ src/systemd/sd-id128.h \ src/systemd/sd-daemon.h \ src/systemd/sd-path.h \ + src/systemd/sd-network.h \ src/libsystemd/sd-bus/sd-bus.c \ src/libsystemd/sd-bus/bus-control.c \ src/libsystemd/sd-bus/bus-control.h \ @@ -2403,7 +2551,6 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-bus/bus-slot.h \ src/libsystemd/sd-bus/bus-protocol.h \ src/libsystemd/sd-bus/kdbus.h \ - src/libsystemd/sd-bus/sd-memfd.c \ src/libsystemd/sd-utf8/sd-utf8.c \ src/libsystemd/sd-event/sd-event.c \ src/libsystemd/sd-event/event-util.h \ @@ -2419,7 +2566,10 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-id128/sd-id128.c \ src/libsystemd/sd-daemon/sd-daemon.c \ src/libsystemd/sd-login/sd-login.c \ - src/libsystemd/sd-path/sd-path.c + src/libsystemd/sd-path/sd-path.c \ + src/libsystemd/sd-network/sd-network.c \ + src/libsystemd/sd-network/network-util.h \ + src/libsystemd/sd-network/network-util.c nodist_libsystemd_internal_la_SOURCES = \ src/libsystemd/libsystemd.sym \ @@ -2518,7 +2668,6 @@ pkginclude_HEADERS += \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ src/systemd/sd-bus-vtable.h \ - src/systemd/sd-memfd.h \ src/systemd/sd-utf8.h \ src/systemd/sd-event.h \ src/systemd/sd-rtnl.h \ @@ -2539,7 +2688,6 @@ tests += \ test-bus-kernel \ test-bus-kernel-bloom \ test-bus-kernel-benchmark \ - test-bus-memfd \ test-bus-zero-copy \ test-bus-introspect \ test-bus-objects \ @@ -2693,13 +2841,6 @@ test_bus_kernel_benchmark_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la -test_bus_memfd_SOURCES = \ - src/libsystemd/sd-bus/test-bus-memfd.c - -test_bus_memfd_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la - test_bus_zero_copy_SOURCES = \ src/libsystemd/sd-bus/test-bus-zero-copy.c @@ -2770,13 +2911,13 @@ libsystemd_network_la_CFLAGS = \ $(KMOD_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/systemd/sd-icmp6-nd.h \ + src/systemd/sd-dhcp6-client.h \ + src/systemd/sd-dhcp6-lease.h \ src/libsystemd-network/sd-dhcp-client.c \ src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ @@ -2793,9 +2934,6 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/ipv4ll-internal.h \ src/libsystemd-network/network-internal.c \ 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 \ @@ -2887,14 +3025,26 @@ if ENABLE_TERMINAL noinst_LTLIBRARIES += \ libsystemd-terminal.la +rootlibexec_PROGRAMS += \ + systemd-consoled + noinst_PROGRAMS += \ + systemd-evcat \ + systemd-modeset \ systemd-subterm -unifontdatadir=$(datadir)/unifont - -dist_unifontdata_DATA = \ +dist_pkgdata_DATA += \ src/libsystemd-terminal/unifont-glyph-array.bin +nodist_userunit_DATA += \ + units/user/systemd-consoled.service + +USER_DEFAULT_TARGET_WANTS += \ + systemd-consoled.service + +EXTRA_DIST += \ + units/user/systemd-consoled.service.in + tests += \ test-term-page \ test-term-parser \ @@ -2902,21 +3052,83 @@ tests += \ endif libsystemd_terminal_la_CFLAGS = \ - $(AM_CFLAGS) + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) libsystemd_terminal_la_SOURCES = \ + src/libsystemd-terminal/grdev.h \ + src/libsystemd-terminal/grdev-internal.h \ + src/libsystemd-terminal/grdev.c \ + src/libsystemd-terminal/grdev-drm.c \ + src/libsystemd-terminal/idev.h \ + src/libsystemd-terminal/idev-internal.h \ + src/libsystemd-terminal/idev.c \ + src/libsystemd-terminal/idev-evdev.c \ + src/libsystemd-terminal/idev-keyboard.c \ + src/libsystemd-terminal/sysview.h \ + src/libsystemd-terminal/sysview-internal.h \ + src/libsystemd-terminal/sysview.c \ + src/libsystemd-terminal/term.h \ src/libsystemd-terminal/term-internal.h \ src/libsystemd-terminal/term-charset.c \ src/libsystemd-terminal/term-page.c \ src/libsystemd-terminal/term-parser.c \ src/libsystemd-terminal/term-screen.c \ src/libsystemd-terminal/term-wcwidth.c \ - src/libsystemd-terminal/unifont-internal.h \ + src/libsystemd-terminal/unifont.h \ + src/libsystemd-terminal/unifont-def.h \ src/libsystemd-terminal/unifont.c libsystemd_terminal_la_LIBADD = \ + libudev-internal.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(TERMINAL_LIBS) + +systemd_consoled_CFLAGS = \ + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) + +systemd_consoled_SOURCES = \ + src/console/consoled.h \ + src/console/consoled.c \ + src/console/consoled-display.c \ + src/console/consoled-manager.c \ + src/console/consoled-session.c \ + src/console/consoled-terminal.c \ + src/console/consoled-workspace.c + +systemd_consoled_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(TERMINAL_LIBS) + +systemd_evcat_CFLAGS = \ + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) + +systemd_evcat_SOURCES = \ + src/libsystemd-terminal/evcat.c + +systemd_evcat_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(TERMINAL_LIBS) + +systemd_modeset_CFLAGS = \ + $(AM_CFLAGS) \ + $(TERMINAL_CFLAGS) + +systemd_modeset_SOURCES = \ + src/libsystemd-terminal/modeset.c + +systemd_modeset_LDADD = \ + libsystemd-terminal.la \ + libsystemd-internal.la \ + libsystemd-shared.la \ + $(TERMINAL_LIBS) systemd_subterm_SOURCES = \ src/libsystemd-terminal/subterm.c @@ -3193,18 +3405,6 @@ libudev_core_la_LIBADD = \ $(BLKID_LIBS) \ $(KMOD_LIBS) -libudev_core_la_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DFIRMWARE_PATH="$(FIRMWARE_PATH)" - -if ENABLE_FIRMWARE -libudev_core_la_SOURCES += \ - src/udev/udev-builtin-firmware.c - -dist_udevrules_DATA += \ - rules/50-firmware.rules -endif - if HAVE_KMOD libudev_core_la_SOURCES += \ src/udev/udev-builtin-kmod.c @@ -3983,8 +4183,9 @@ dist_pkgsysconf_DATA += \ dist_catalog_DATA = \ catalog/systemd.fr.catalog \ - catalog/systemd.ru.catalog \ catalog/systemd.it.catalog \ + catalog/systemd.pl.catalog \ + catalog/systemd.ru.catalog \ catalog/systemd.catalog SOCKETS_TARGET_WANTS += \ @@ -4187,57 +4388,6 @@ endif EXTRA_DIST += \ units/systemd-vconsole-setup.service.in -# ------------------------------------------------------------------------------ -if ENABLE_READAHEAD -systemd_readahead_SOURCES = \ - src/readahead/readahead.c \ - src/readahead/readahead-collect.c \ - src/readahead/readahead-replay.c \ - src/readahead/readahead-analyze.c \ - src/readahead/readahead-common.c \ - src/readahead/readahead-common.h - -systemd_readahead_LDADD = \ - libsystemd-internal.la \ - libudev-internal.la \ - libsystemd-shared.la - -dist_doc_DATA += \ - src/readahead/sd-readahead.c \ - src/systemd/sd-readahead.h - -rootlibexec_PROGRAMS += \ - systemd-readahead - -dist_systemunit_DATA += \ - units/systemd-readahead-drop.service \ - units/systemd-readahead-done.timer - -nodist_systemunit_DATA += \ - units/systemd-readahead-collect.service \ - units/systemd-readahead-replay.service \ - units/systemd-readahead-done.service - -manual_tests += \ - test-ssd - -test_ssd_SOURCES = \ - src/readahead/test-ssd.c \ - src/readahead/readahead-common.c \ - src/readahead/readahead-common.h - -test_ssd_LDADD = \ - libsystemd-internal.la \ - libudev-internal.la \ - libsystemd-shared.la - -endif - -EXTRA_DIST += \ - units/systemd-readahead-collect.service.in \ - units/systemd-readahead-replay.service.in \ - units/systemd-readahead-done.service.in - # ------------------------------------------------------------------------------ if ENABLE_BOOTCHART systemd_bootchart_SOURCES = \ @@ -4396,7 +4546,7 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-hostnamed.service -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.hostname1.busname dist_dbuspolicy_DATA += \ @@ -4439,13 +4589,11 @@ EXTRA_DIST += \ units/systemd-hostnamed.service.in # ------------------------------------------------------------------------------ -if ENABLE_KDBUS -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.systemd1.busname BUSNAMES_TARGET_WANTS += \ org.freedesktop.systemd1.busname -endif # ------------------------------------------------------------------------------ if ENABLE_LOCALED @@ -4460,7 +4608,7 @@ systemd_localed_LDADD = \ nodist_systemunit_DATA += \ units/systemd-localed.service -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.locale1.busname rootlibexec_PROGRAMS += \ @@ -4535,7 +4683,7 @@ dist_dbuspolicy_DATA += \ nodist_systemunit_DATA += \ units/systemd-timedated.service -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.timedate1.busname polkitpolicy_files += \ @@ -4574,7 +4722,12 @@ EXTRA_DIST += \ if ENABLE_TIMESYNCD systemd_timesyncd_SOURCES = \ src/timesync/timesyncd.c \ - src/timesync/timesyncd.h + src/timesync/timesyncd-manager.c \ + src/timesync/timesyncd-manager.h \ + src/timesync/timesyncd-conf.c \ + src/timesync/timesyncd-conf.h \ + src/timesync/timesyncd-server.c \ + src/timesync/timesyncd-server.h nodist_systemd_timesyncd_SOURCES = \ src/timesync/timesyncd-gperf.c @@ -4692,7 +4845,9 @@ nodist_systemunit_DATA += \ units/systemd-machined.service dist_systemunit_DATA += \ - units/machine.slice \ + units/machine.slice + +dist_systemunit_DATA_busnames += \ units/org.freedesktop.machine1.busname dist_dbussystemservice_DATA += \ @@ -4747,6 +4902,7 @@ systemd_resolved_SOURCES = \ src/resolve/resolved-bus.h \ src/resolve/resolved-link.h \ src/resolve/resolved-link.c \ + src/resolve/resolved-def.h \ src/resolve/resolved-dns-domain.h \ src/resolve/resolved-dns-domain.c \ src/resolve/resolved-dns-rr.h \ @@ -4801,7 +4957,7 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-resolved.service -dist_systemunit_DATA += \ +dist_systemunit_DATA_busnames += \ units/org.freedesktop.resolve1.busname dist_dbuspolicy_DATA += \ @@ -4916,6 +5072,7 @@ libsystemd_networkd_core_la_CFLAGS = \ libsystemd_networkd_core_la_SOURCES = \ src/libsystemd-network/network-internal.h \ src/network/networkd.h \ + src/network/networkd-link.h \ src/network/networkd-netdev.h \ src/network/networkd-netdev-tunnel.h \ src/network/networkd-netdev-veth.h \ @@ -4937,6 +5094,8 @@ libsystemd_networkd_core_la_SOURCES = \ src/network/networkd-netdev-bond.c \ src/network/networkd-netdev-bridge.c \ src/network/networkd-link.c \ + src/network/networkd-ipv4ll.c \ + src/network/networkd-dhcp4.c \ src/network/networkd-network.c \ src/network/networkd-address.c \ src/network/networkd-route.c \ @@ -4974,6 +5133,18 @@ systemd_networkd_wait_online_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +rootbin_PROGRAMS += \ + networkctl + +networkctl_SOURCES = \ + src/network/networkctl.c + +networkctl_LDADD = \ + libsystemd-internal.la \ + libudev-internal.la \ + libsystemd-shared.la \ + libsystemd-network.la + test_network_SOURCES = \ src/network/test-network.c @@ -5178,7 +5349,9 @@ nodist_systemunit_DATA += \ units/systemd-user-sessions.service dist_systemunit_DATA += \ - units/user.slice \ + units/user.slice + +dist_systemunit_DATA_busnames += \ units/org.freedesktop.login1.busname dist_dbussystemservice_DATA += \ @@ -5627,6 +5800,11 @@ src/%: src/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ +tmpfiles.d/%: tmpfiles.d/%.m4 + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ + + units/%: units/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@ @@ -5734,6 +5912,7 @@ SOCKETS_TARGET_WANTS += \ systemd-initctl.socket \ systemd-shutdownd.socket +if HAVE_UTMP if HAVE_SYSV_COMPAT RUNLEVEL1_TARGET_WANTS += \ systemd-update-utmp-runlevel.service @@ -5748,9 +5927,11 @@ RUNLEVEL5_TARGET_WANTS += \ endif SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service \ - systemd-update-done.service \ - ldconfig.service + systemd-update-utmp.service +endif + +SYSINIT_TARGET_WANTS += \ + systemd-update-done.service LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ @@ -5788,7 +5969,6 @@ SYSTEM_UNIT_ALIASES += \ USER_UNIT_ALIASES += \ $(systemunitdir)/shutdown.target shutdown.target \ $(systemunitdir)/sockets.target sockets.target \ - $(systemunitdir)/busnames.target busnames.target \ $(systemunitdir)/timers.target timers.target \ $(systemunitdir)/paths.target paths.target \ $(systemunitdir)/bluetooth.target bluetooth.target \ @@ -5796,6 +5976,11 @@ USER_UNIT_ALIASES += \ $(systemunitdir)/sound.target sound.target \ $(systemunitdir)/smartcard.target smartcard.target +if ENABLE_KDBUS +USER_UNIT_ALIASES += \ + $(systemunitdir)/busnames.target busnames.target +endif + GENERAL_ALIASES += \ $(systemunitdir)/remote-fs.target $(pkgsysconfdir)/system/multi-user.target.wants/remote-fs.target \ $(systemunitdir)/getty@.service $(pkgsysconfdir)/system/getty.target.wants/getty@tty1.service \