X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c5667c3a63c7c384b2ae98de1905a0a0b1352012;hp=35c877fe2a798b426c22634bbb499ec9e4fe422d;hb=a4705396adbf1a8a3e52ed133d9b1f12cb13e77e;hpb=bb7dd0b04a6e89674100476eed0bbd05c6a4cbd8 diff --git a/Makefile.am b/Makefile.am index 35c877fe2..c5667c3a6 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 @@ -36,16 +39,16 @@ SUBDIRS = . po .PRECIOUS: $(TEST_SUITE_LOG) Makefile LIBUDEV_CURRENT=7 -LIBUDEV_REVISION=0 +LIBUDEV_REVISION=1 LIBUDEV_AGE=6 LIBGUDEV_CURRENT=2 LIBGUDEV_REVISION=0 LIBGUDEV_AGE=2 -LIBSYSTEMD_CURRENT=4 +LIBSYSTEMD_CURRENT=5 LIBSYSTEMD_REVISION=0 -LIBSYSTEMD_AGE=4 +LIBSYSTEMD_AGE=5 # The following four libraries only exist for compatibility reasons, # their version info should not be bumped anymore @@ -247,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 = @@ -267,6 +271,7 @@ install-target-wants-hook: 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) @@ -375,7 +380,6 @@ rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ - systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ systemd-remount-fs \ @@ -388,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 \ @@ -459,7 +468,6 @@ dist_systemunit_DATA = \ units/network-online.target \ units/nss-lookup.target \ units/nss-user-lookup.target \ - units/hybrid-sleep.target \ units/poweroff.target \ units/reboot.target \ units/rescue.target \ @@ -515,15 +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-hybrid-sleep.service \ units/systemd-suspend.service \ units/systemd-halt.service \ units/systemd-poweroff.service \ @@ -543,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 \ @@ -579,7 +590,6 @@ EXTRA_DIST += \ units/systemd-fsck-root.service.in \ units/user@.service.in \ units/debug-shell.service.in \ - units/systemd-hybrid-sleep.service.in \ units/systemd-suspend.service.in \ units/quotaon.service.in \ units/initrd-parse-etc.service.in \ @@ -704,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 \ @@ -721,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 # ------------------------------------------------------------------------------ @@ -730,19 +740,20 @@ 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 \ src/shared/securebits.h \ src/shared/special.h \ src/shared/list.h \ + src/shared/unaligned.h \ src/shared/macro.h \ src/shared/def.h \ src/shared/sparse-endian.h \ src/shared/refcnt.h \ src/shared/udev-util.h \ src/shared/bus-errors.h \ + src/shared/bus-errors.c \ src/shared/device-nodes.c \ src/shared/device-nodes.h \ src/shared/util.c \ @@ -759,11 +770,12 @@ libsystemd_shared_la_SOURCES = \ src/shared/time-util.h \ src/shared/locale-util.c \ src/shared/locale-util.h \ + src/shared/mempool.c \ + src/shared/mempool.h \ src/shared/hashmap.c \ src/shared/hashmap.h \ src/shared/siphash24.c \ src/shared/siphash24.h \ - src/shared/set.c \ src/shared/set.h \ src/shared/fdset.c \ src/shared/fdset.h \ @@ -805,7 +817,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 \ @@ -871,14 +882,17 @@ 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/memfd-util.c \ + src/shared/memfd-util.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 \ @@ -919,6 +933,8 @@ libsystemd_label_la_SOURCES = \ src/shared/mkdir-label.c \ src/shared/ask-password-api.c \ src/shared/ask-password-api.h \ + src/shared/switch-root.h \ + src/shared/switch-root.c \ src/shared/fileio-label.c \ src/shared/fileio-label.h \ src/shared/dev-setup.c \ @@ -1330,7 +1346,9 @@ tests += \ test-fileio \ test-time \ test-hashmap \ + test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ @@ -1342,7 +1360,10 @@ tests += \ test-async \ test-ratelimit \ test-condition-util \ - test-uid-range + test-uid-range \ + test-bus-policy \ + test-locale-util \ + test-copy EXTRA_DIST += \ test/a.service \ @@ -1374,7 +1395,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 @@ -1481,13 +1507,26 @@ test_async_SOURCES = \ test_async_LDADD = \ libsystemd-shared.la +test_locale_util_SOURCES = \ + src/test/test-locale-util.c + +test_locale_util_LDADD = \ + libsystemd-shared.la + +test_copy_SOURCES = \ + src/test/test-copy.c + +test_copy_LDADD = \ + libsystemd-shared.la + test_condition_util_SOURCES = \ src/test/test-condition-util.c test_condition_util_LDADD = \ libsystemd-shared.la \ - libsystemd-internal.la - + libsystemd-internal.la \ + libsystemd-capability.la \ + libsystemd-label.la test_fdset_SOURCES = \ src/test/test-fdset.c @@ -1505,6 +1544,7 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ + -lm \ libsystemd-core.la test_uid_range_SOURCES = \ @@ -1549,12 +1589,37 @@ test_namespace_SOURCES = \ test_namespace_LDADD = \ libsystemd-core.la +CLEANFILES += \ + src/test/test-hashmap-ordered.c + +BUILT_SOURCES += \ + src/test/test-hashmap-ordered.c + +src/test/test-hashmap-ordered.c: src/test/test-hashmap-plain.c + $(AM_V_at)$(MKDIR_P) $(dir $@) + $(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \ + { if (!match($$0, "^#include")) \ + gsub(/hashmap/, "ordered_hashmap"); \ + gsub(/HASHMAP/, "ORDERED_HASHMAP"); \ + gsub(/Hashmap/, "OrderedHashmap"); \ + print }' <$< >$@ + +nodist_test_hashmap_SOURCES = \ + src/test/test-hashmap-ordered.c + test_hashmap_SOURCES = \ - src/test/test-hashmap.c + src/test/test-hashmap.c \ + src/test/test-hashmap-plain.c 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 @@ -1564,6 +1629,12 @@ test_xml_LDADD = \ test_list_SOURCES = \ src/test/test-list.c +test_unaligned_LDADD = \ + libsystemd-core.la + +test_unaligned_SOURCES = \ + src/test/test-unaligned.c + test_list_LDADD = \ libsystemd-core.la @@ -1782,6 +1853,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 @@ -2034,9 +2115,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 @@ -2159,17 +2242,17 @@ systemd_system_update_generator_LDADD = \ # ------------------------------------------------------------------------------ if ENABLE_HIBERNATE systemgenerator_PROGRAMS += \ - systemd-hibernate-resume-generator + systemd-hibernate-resume-generator rootlibexec_PROGRAMS += \ - systemd-hibernate-resume + systemd-hibernate-resume systemd_hibernate_resume_SOURCES = \ - src/hibernate-resume/hibernate-resume.c + src/hibernate-resume/hibernate-resume.c systemd_hibernate_resume_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-internal.la \ + libsystemd-shared.la systemd_hibernate_resume_generator_SOURCES = \ src/hibernate-resume/hibernate-resume-generator.c @@ -2179,16 +2262,18 @@ systemd_hibernate_resume_generator_LDADD = \ libsystemd-shared.la EXTRA_DIST += \ - units/systemd-hibernate.service.in \ - units/systemd-hibernate-resume@.service.in + units/systemd-hibernate.service.in \ + units/systemd-hibernate-resume@.service.in \ + units/systemd-hybrid-sleep.service.in dist_systemunit_DATA += \ - units/hibernate.target + units/hibernate.target \ + units/hybrid-sleep.target nodist_systemunit_DATA += \ - units/systemd-hibernate.service \ - units/systemd-hibernate-resume@.service - + units/systemd-hibernate.service \ + units/systemd-hibernate-resume@.service \ + units/systemd-hybrid-sleep.service endif # ------------------------------------------------------------------------------ @@ -2328,8 +2413,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 \ @@ -2439,13 +2523,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 = \ @@ -2530,8 +2617,7 @@ libsystemd_internal_la_SOURCES = \ src/libsystemd/sd-network/network-util.c nodist_libsystemd_internal_la_SOURCES = \ - src/libsystemd/libsystemd.sym \ - src/libsystemd/sd-bus/bus-error-mapping.c + src/libsystemd/libsystemd.sym libsystemd_internal_la_CFLAGS = \ $(AM_CFLAGS) \ @@ -2569,13 +2655,11 @@ noinst_LTLIBRARIES += \ EXTRA_DIST += \ src/libsystemd/libsystemd.sym.m4 \ src/libsystemd/libsystemd.pc.in \ - src/libsystemd/sd-bus/bus-error-mapping.gperf \ src/libsystemd/sd-bus/DIFFERENCES \ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION CLEANFILES += \ - src/libsystemd/libsystemd.sym \ - src/libsystemd/sd-bus/bus-error-mapping.c + src/libsystemd/libsystemd.sym BUILT_SOURCES += \ src/libsystemd/libsystemd.sym @@ -2876,6 +2960,7 @@ libsystemd_network_la_SOURCES = \ src/systemd/sd-icmp6-nd.h \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-dhcp6-lease.h \ + src/systemd/sd-pppoe.h \ src/libsystemd-network/sd-dhcp-client.c \ src/libsystemd-network/sd-dhcp-server.c \ src/libsystemd-network/dhcp-network.c \ @@ -2890,6 +2975,7 @@ libsystemd_network_la_SOURCES = \ src/libsystemd-network/ipv4ll-network.c \ src/libsystemd-network/ipv4ll-packet.c \ src/libsystemd-network/ipv4ll-internal.h \ + src/libsystemd-network/sd-pppoe.c \ src/libsystemd-network/network-internal.c \ src/libsystemd-network/network-internal.h \ src/libsystemd-network/sd-icmp6-nd.c \ @@ -2949,6 +3035,14 @@ test_ipv4ll_LDADD = \ libsystemd-internal.la \ libsystemd-shared.la +test_pppoe_SOURCES = \ + src/systemd/sd-pppoe.h \ + src/libsystemd-network/test-pppoe.c + +test_pppoe_LDADD = \ + libsystemd-network.la \ + libsystemd-shared.la + test_icmp6_rs_SOURCES = \ src/systemd/sd-dhcp6-client.h \ src/systemd/sd-icmp6-nd.h \ @@ -2978,20 +3072,34 @@ tests += \ test-icmp6-rs \ test-dhcp6-client +manual_tests += \ + test-pppoe + # ------------------------------------------------------------------------------ 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 \ @@ -3003,6 +3111,10 @@ libsystemd_terminal_la_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 \ @@ -3011,13 +3123,15 @@ libsystemd_terminal_la_SOURCES = \ 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 = \ @@ -3026,6 +3140,25 @@ libsystemd_terminal_la_LIBADD = \ 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) @@ -3039,6 +3172,19 @@ systemd_evcat_LDADD = \ 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 @@ -3342,7 +3488,8 @@ systemd_udevd_SOURCES = \ src/udev/udevd.c systemd_udevd_LDADD = \ - libudev-core.la + libudev-core.la \ + libsystemd-capability.la udevadm_SOURCES = \ src/udev/udevadm.c \ @@ -3356,7 +3503,8 @@ udevadm_SOURCES = \ src/udev/udevadm-test-builtin.c udevadm_LDADD = \ - libudev-core.la + libudev-core.la \ + libsystemd-capability.la # Update hwdb on installation. Do not bother if installing # in DESTDIR, since this is likely for packaging purposes. @@ -3390,7 +3538,8 @@ test_udev_SOURCES = \ src/test/test-udev.c test_udev_LDADD = \ - libudev-core.la \ + libudev-core.la \ + libsystemd-capability.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ $(SELINUX_LIBS) @@ -3929,6 +4078,8 @@ libsystemd_journal_core_la_SOURCES = \ src/journal/journald-wall.h \ src/journal/journald-native.c \ src/journal/journald-native.h \ + src/journal/journald-audit.c \ + src/journal/journald-audit.h \ src/journal/journald-rate-limit.c \ src/journal/journald-rate-limit.h \ src/journal/journal-internal.h @@ -4080,7 +4231,8 @@ bin_PROGRAMS += \ dist_systemunit_DATA += \ units/systemd-journald.socket \ - units/systemd-journald-dev-log.socket + units/systemd-journald-dev-log.socket \ + units/systemd-journald-audit.socket nodist_systemunit_DATA += \ units/systemd-journald.service \ @@ -4092,13 +4244,15 @@ 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 += \ systemd-journald.socket \ - systemd-journald-dev-log.socket + systemd-journald-dev-log.socket \ + systemd-journald-audit.socket SYSINIT_TARGET_WANTS += \ systemd-journald.service \ @@ -4289,6 +4443,9 @@ rootlibexec_PROGRAMS += \ nodist_systemunit_DATA += \ units/systemd-vconsole-setup.service +dist_udevrules_DATA += \ + src/vconsole/90-vconsole.rules + SYSINIT_TARGET_WANTS += \ systemd-vconsole-setup.service endif @@ -4296,57 +4453,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 = \ @@ -5107,11 +5213,9 @@ networkctl_LDADD = \ test_network_SOURCES = \ src/network/test-network.c -test_network_CFLAGS = \ - $(AM_CFLAGS) - test_network_LDADD = \ - libsystemd-networkd-core.la + libsystemd-networkd-core.la \ + libsystemd-capability.la test_network_tables_SOURCES = \ src/network/test-network-tables.c \ @@ -5338,20 +5442,6 @@ SYSTEM_UNIT_ALIASES += \ BUSNAMES_TARGET_WANTS += \ org.freedesktop.login1.busname -if ENABLE_MULTI_SEAT_X - -systemd_multi_seat_x_SOURCES = \ - src/login/multi-seat-x.c - -systemd_multi_seat_x_LDADD = \ - libsystemd-label.la \ - libsystemd-shared.la - -rootlibexec_PROGRAMS += \ - systemd-multi-seat-x - -endif - dist_udevrules_DATA += \ src/login/70-uaccess.rules \ src/login/70-power-switch.rules @@ -5871,6 +5961,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 @@ -5885,7 +5976,10 @@ RUNLEVEL5_TARGET_WANTS += \ endif SYSINIT_TARGET_WANTS += \ - systemd-update-utmp.service \ + systemd-update-utmp.service +endif + +SYSINIT_TARGET_WANTS += \ systemd-update-done.service LOCAL_FS_TARGET_WANTS += \ @@ -6196,3 +6290,6 @@ print-%: git-contrib: @git shortlog -s `git describe --abbrev=0`.. | cut -c8- | awk '{ print $$0 "," }' | sort -u + +EXTRA_DIST += \ + tools/gdb-sd_dump_hashmaps.py