X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=5b46243e650c650c36e652c94dd562fdf52c8349;hp=1bdc91c2390ac1a38dbba43eae633db86ac6e19c;hb=98940a3cd93807b5a3809bb1fb7ab43d450939f1;hpb=2f88c8583aea6626c5f0a84cfc6de4b0a17f2d1c diff --git a/Makefile.am b/Makefile.am index 1bdc91c23..5b46243e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,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 @@ -250,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 = @@ -270,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) @@ -378,18 +380,24 @@ rootlibexec_PROGRAMS = \ systemd \ systemd-cgroups-agent \ systemd-initctl \ - systemd-update-utmp \ systemd-shutdownd \ systemd-shutdown \ systemd-remount-fs \ systemd-reply-password \ systemd-fsck \ + systemd-machine-id-commit \ systemd-ac-power \ systemd-sysctl \ systemd-sleep \ + systemd-bus-proxyd \ systemd-socket-proxyd \ systemd-update-done +if HAVE_UTMP +rootlibexec_PROGRAMS += \ + systemd-update-utmp +endif + systemgenerator_PROGRAMS = \ systemd-getty-generator \ systemd-fstab-generator \ @@ -516,8 +524,6 @@ 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 \ @@ -531,6 +537,7 @@ nodist_systemunit_DATA = \ units/systemd-kexec.service \ units/systemd-fsck@.service \ units/systemd-fsck-root.service \ + units/systemd-machine-id-commit.service \ units/systemd-udevd.service \ units/systemd-udev-trigger.service \ units/systemd-udev-settle.service \ @@ -543,6 +550,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 \ @@ -577,6 +590,7 @@ EXTRA_DIST += \ units/user/systemd-exit.service.in \ units/systemd-fsck@.service.in \ units/systemd-fsck-root.service.in \ + units/systemd-machine-id-commit.service.in \ units/user@.service.in \ units/debug-shell.service.in \ units/systemd-suspend.service.in \ @@ -703,7 +717,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 \ @@ -727,20 +742,23 @@ noinst_LTLIBRARIES += \ libsystemd-shared.la libsystemd_shared_la_SOURCES = \ + src/shared/capability.c \ + src/shared/capability.h \ 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 \ @@ -757,11 +775,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 \ @@ -795,6 +814,7 @@ libsystemd_shared_la_SOURCES = \ src/shared/socket-util.h \ src/shared/in-addr-util.c \ src/shared/in-addr-util.h \ + src/shared/ether-addr-util.h \ src/shared/conf-files.c \ src/shared/conf-files.h \ src/shared/cgroup-util.c \ @@ -803,7 +823,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 \ @@ -848,8 +867,6 @@ libsystemd_shared_la_SOURCES = \ src/shared/audit.h \ src/shared/xml.c \ src/shared/xml.h \ - src/shared/condition-util.c \ - src/shared/condition-util.h \ src/shared/bus-label.c \ src/shared/bus-label.h \ src/shared/gpt.h \ @@ -869,14 +886,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 \ @@ -887,9 +907,13 @@ nodist_libsystemd_shared_la_SOURCES = \ libsystemd_shared_la_CFLAGS = \ $(AM_CFLAGS) \ + $(CAP_CFLAGS) \ $(SECCOMP_CFLAGS) \ -pthread +libsystemd_shared_la_LIBADD = \ + $(CAP_LIBS) + # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ libsystemd-units.la @@ -917,12 +941,16 @@ 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 \ src/shared/dev-setup.h \ src/shared/dropin.c \ src/shared/dropin.h \ + src/shared/condition.c \ + src/shared/condition.h \ src/shared/generator.h \ src/shared/generator.c @@ -969,21 +997,6 @@ libsystemd_logs_la_SOURCES = \ src/shared/logs-show.c \ src/shared/logs-show.h -# ------------------------------------------------------------------------------ -noinst_LTLIBRARIES += \ - libsystemd-capability.la - -libsystemd_capability_la_SOURCES = \ - src/shared/capability.c \ - src/shared/capability.h - -libsystemd_capability_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) - -libsystemd_capability_la_LIBADD = \ - $(CAP_LIBS) - # ------------------------------------------------------------------------------ if HAVE_ACL noinst_LTLIBRARIES += \ @@ -1112,10 +1125,10 @@ libsystemd_core_la_SOURCES = \ src/core/machine-id-setup.h \ src/core/mount-setup.c \ src/core/mount-setup.h \ + src/core/kmod-setup.c \ + src/core/kmod-setup.h \ src/core/loopback-setup.h \ src/core/loopback-setup.c \ - src/core/condition.c \ - src/core/condition.h \ src/core/namespace.c \ src/core/namespace.h \ src/core/build.h \ @@ -1129,12 +1142,6 @@ libsystemd_core_la_SOURCES = \ src/core/failure-action.c \ src/core/failure-action.h -if HAVE_KMOD -libsystemd_core_la_SOURCES += \ - src/core/kmod-setup.c \ - src/core/kmod-setup.h -endif - nodist_libsystemd_core_la_SOURCES = \ src/core/load-fragment-gperf.c \ src/core/load-fragment-gperf-nulstr.c @@ -1143,14 +1150,13 @@ libsystemd_core_la_CFLAGS = \ $(AM_CFLAGS) \ $(PAM_CFLAGS) \ $(AUDIT_CFLAGS) \ - $(CAP_CFLAGS) \ $(KMOD_CFLAGS) \ $(APPARMOR_CFLAGS) \ $(SECCOMP_CFLAGS) \ + $(MOUNT_CFLAGS) \ -pthread libsystemd_core_la_LIBADD = \ - libsystemd-capability.la \ libsystemd-units.la \ libsystemd-label.la \ libudev-internal.la \ @@ -1158,10 +1164,10 @@ libsystemd_core_la_LIBADD = \ libsystemd-internal.la \ $(PAM_LIBS) \ $(AUDIT_LIBS) \ - $(CAP_LIBS) \ $(KMOD_LIBS) \ $(APPARMOR_LIBS) \ - $(SECCOMP_LIBS) + $(SECCOMP_LIBS) \ + $(MOUNT_LIBS) if HAVE_SECCOMP libsystemd_core_la_LIBADD += \ @@ -1305,6 +1311,7 @@ tests += \ test-env-replace \ test-strbuf \ test-strv \ + test-path \ test-path-util \ test-strxcpyx \ test-unit-name \ @@ -1328,7 +1335,9 @@ tests += \ test-fileio \ test-time \ test-hashmap \ + test-set \ test-list \ + test-unaligned \ test-tables \ test-device-nodes \ test-xml \ @@ -1339,9 +1348,12 @@ tests += \ test-capability \ test-async \ test-ratelimit \ - test-condition-util \ + test-condition \ test-uid-range \ - test-bus-policy + test-bus-policy \ + test-locale-util \ + test-execute \ + test-copy EXTRA_DIST += \ test/a.service \ @@ -1374,10 +1386,47 @@ EXTRA_DIST += \ test/testsuite.target \ test/timers.target \ test/unstoppable.service \ + test/path-changed.service \ + test/path-directorynotempty.service \ + test/path-existsglob.service \ + test/path-exists.service \ + test/path-makedirectory.service \ + test/path-modified.service \ + test/path-mycustomunit.service \ + test/path-service.service \ + test/path-changed.path \ + test/path-directorynotempty.path \ + test/path-existsglob.path \ + test/path-exists.path \ + test/path-makedirectory.path \ + test/path-modified.path \ + test/path-unit.path \ + test/exec-environment-empty.service \ + test/exec-environment-multiple.service \ + test/exec-environment.service \ + test/exec-group.service \ + test/exec-ignoresigpipe-no.service \ + test/exec-ignoresigpipe-yes.service \ + test/exec-personality-x86-64.service \ + test/exec-personality-x86.service \ + test/exec-privatedevices-no.service \ + test/exec-privatedevices-yes.service \ + test/exec-privatetmp-no.service \ + test/exec-privatetmp-yes.service \ + test/exec-systemcallerrornumber.service \ + test/exec-systemcallfilter-failing2.service \ + test/exec-systemcallfilter-failing.service \ + test/exec-systemcallfilter-not-failing2.service \ + test/exec-systemcallfilter-not-failing.service \ + test/exec-user.service \ + test/exec-workingdirectory.service \ test/bus-policy/hello.conf \ test/bus-policy/methods.conf \ test/bus-policy/ownerships.conf \ - test/bus-policy/signals.conf + test/bus-policy/signals.conf \ + test/bus-policy/check-own-rules.conf \ + test/bus-policy/many-rules.conf \ + test/bus-policy/test.conf EXTRA_DIST += \ @@ -1476,8 +1525,7 @@ test_capability_SOURCES = \ src/test/test-capability.c test_capability_LDADD = \ - libsystemd-shared.la \ - libsystemd-capability.la + libsystemd-shared.la test_async_SOURCES = \ src/test/test-async.c @@ -1485,19 +1533,32 @@ test_async_SOURCES = \ test_async_LDADD = \ libsystemd-shared.la -test_condition_util_SOURCES = \ - src/test/test-condition-util.c +test_locale_util_SOURCES = \ + src/test/test-locale-util.c -test_condition_util_LDADD = \ - libsystemd-shared.la \ - libsystemd-internal.la +test_locale_util_LDADD = \ + libsystemd-shared.la + +test_copy_SOURCES = \ + src/test/test-copy.c + +test_copy_LDADD = \ + libsystemd-shared.la +test_condition_SOURCES = \ + src/test/test-condition.c + +test_condition_LDADD = \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la test_fdset_SOURCES = \ src/test/test-fdset.c test_fdset_LDADD = \ - libsystemd-core.la + libsystemd-shared.la \ + libsystemd-internal.la test_ratelimit_SOURCES = \ src/test/test-ratelimit.c @@ -1509,31 +1570,32 @@ test_util_SOURCES = \ src/test/test-util.c test_util_LDADD = \ - libsystemd-core.la + -lm \ + libsystemd-shared.la test_uid_range_SOURCES = \ src/test/test-uid-range.c test_uid_range_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_socket_util_SOURCES = \ src/test/test-socket-util.c test_socket_util_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_ring_SOURCES = \ src/test/test-ring.c test_ring_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_barrier_SOURCES = \ src/test/test-barrier.c test_barrier_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_pty_SOURCES = \ src/test/test-pty.c @@ -1553,11 +1615,36 @@ 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 + libsystemd-shared.la + +test_set_SOURCES = \ + src/test/test-set.c + +test_set_LDADD = \ + libsystemd-shared.la test_xml_SOURCES = \ src/test/test-xml.c @@ -1569,7 +1656,13 @@ test_list_SOURCES = \ src/test/test-list.c test_list_LDADD = \ - libsystemd-core.la + libsystemd-shared.la + +test_unaligned_LDADD = \ + libsystemd-shared.la + +test_unaligned_SOURCES = \ + src/test/test-unaligned.c test_tables_SOURCES = \ src/test/test-tables.c \ @@ -1599,19 +1692,19 @@ test_prioq_SOURCES = \ src/test/test-prioq.c test_prioq_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_fileio_SOURCES = \ src/test/test-fileio.c test_fileio_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_time_SOURCES = \ src/test/test-time.c test_time_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_architecture_SOURCES = \ src/test/test-architecture.c @@ -1623,7 +1716,7 @@ test_log_SOURCES = \ src/test/test-log.c test_log_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_ipcrm_SOURCES = \ src/test/test-ipcrm.c @@ -1648,13 +1741,13 @@ test_ellipsize_SOURCES = \ src/test/test-ellipsize.c test_ellipsize_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_date_SOURCES = \ src/test/test-date.c test_date_LDADD = \ - libsystemd-core.la + libsystemd-shared.la test_sleep_SOURCES = \ src/test/test-sleep.c @@ -1699,8 +1792,7 @@ test_cgroup_mask_SOURCES = \ src/test/test-cgroup-mask.c test_cgroup_mask_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DTEST_DIR=\"$(abs_top_srcdir)/test\" + $(AM_CPPFLAGS) test_cgroup_mask_CFLAGS = \ $(AM_CFLAGS) \ @@ -1744,6 +1836,24 @@ test_path_util_SOURCES = \ test_path_util_LDADD = \ libsystemd-shared.la +test_path_SOURCES = \ + src/test/test-path.c + +test_path_CFLAGS = \ + $(AM_CFLAGS) + +test_path_LDADD = \ + libsystemd-core.la + +test_execute_SOURCES = \ + src/test/test-execute.c + +test_execute_CFLAGS = \ + $(AM_CFLAGS) + +test_execute_LDADD = \ + libsystemd-core.la + test_strxcpyx_SOURCES = \ src/test/test-strxcpyx.c @@ -1769,8 +1879,7 @@ test_sched_prio_SOURCES = \ src/test/test-sched-prio.c test_sched_prio_CPPFLAGS = \ - $(AM_CPPFLAGS) \ - -DTEST_DIR=\"$(abs_top_srcdir)/test\" + $(AM_CPPFLAGS) test_sched_prio_CFLAGS = \ $(AM_CFLAGS) \ @@ -1792,7 +1901,6 @@ test_bus_policy_SOURCES = \ src/bus-proxyd/bus-policy.h test_bus_policy_LDADD = \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -1820,7 +1928,8 @@ lcov-report: $(MKDIR_P) $(coverage_dir) lcov $(coverage_opts) --compat-libtool --capture --no-external \ | sed 's|$(abspath $(builddir))|$(abspath $(srcdir))|' > $(coverage_dir)/.lcov.info - genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov.info + lcov --remove $(coverage_dir)/.lcov.info --output-file $(coverage_dir)/.lcov-clean.info 'test-*' + genhtml -t "systemd test coverage" -o $(coverage_dir) $(coverage_dir)/.lcov-clean.info @echo "Coverage report generated in $(abs_builddir)/$(coverage_dir)/index.html" # lcov doesn't work properly with vpath builds, make sure that bad @@ -1950,7 +2059,6 @@ systemd_tmpfiles_SOURCES = \ systemd_tmpfiles_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -1971,7 +2079,6 @@ nodist_tmpfiles_DATA = \ 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 @@ -2013,7 +2120,6 @@ systemd_sysusers_SOURCES = \ systemd_sysusers_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -2027,8 +2133,7 @@ SYSINIT_TARGET_WANTS += \ systemd-sysusers.service dist_sysusers_DATA = \ - sysusers.d/systemd.conf \ - sysusers.d/systemd-remote.conf + sysusers.d/systemd.conf nodist_sysusers_DATA = \ sysusers.d/basic.conf @@ -2062,7 +2167,6 @@ systemd_firstboot_SOURCES = \ systemd_firstboot_LDADD = \ libsystemd-units.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ -lcrypt @@ -2114,6 +2218,20 @@ systemd_fsck_LDADD = \ libudev-internal.la \ libsystemd-shared.la +# ------------------------------------------------------------------------------ +systemd_machine_id_commit_SOURCES = \ + src/machine-id-commit/machine-id-commit.c \ + src/core/machine-id-setup.c \ + src/core/machine-id-setup.h + +systemd_machine_id_commit_LDADD = \ + libsystemd-label.la \ + libsystemd-internal.la \ + libsystemd-shared.la + +SYSINIT_TARGET_WANTS += \ + systemd-machine-id-commit.service + # ------------------------------------------------------------------------------ systemd_ac_power_SOURCES = \ src/ac-power/ac-power.c @@ -2405,7 +2523,6 @@ systemd_nspawn_CFLAGS = \ systemd_nspawn_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la \ @@ -2423,22 +2540,16 @@ systemd_run_SOURCES = \ systemd_run_LDADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la # ------------------------------------------------------------------------------ -if ENABLE_KDBUS -rootlibexec_PROGRAMS += \ - systemd-bus-proxyd - systemd_bus_proxyd_SOURCES = \ 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 @@ -2453,19 +2564,23 @@ bus-proxyd-uninstall-hook: INSTALL_EXEC_HOOKS += bus-proxyd-install-hook UNINSTALL_EXEC_HOOKS += bus-proxyd-uninstall-hook +if ENABLE_KDBUS nodist_systemunit_DATA += \ units/systemd-bus-proxyd@.service 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 = \ @@ -2550,8 +2665,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) \ @@ -2579,23 +2693,17 @@ libsystemd_dump_la_SOURCES = \ src/libsystemd/sd-bus/bus-dump.c \ src/libsystemd/sd-bus/bus-dump.h -libsystemd_dump_la_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) - noinst_LTLIBRARIES += \ libsystemd-dump.la 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 @@ -2683,19 +2791,16 @@ test_bus_marshal_SOURCES = \ src/libsystemd/sd-bus/test-bus-marshal.c test_bus_marshal_LDADD = \ + libsystemd-dump.la \ libsystemd-internal.la \ libsystemd-shared.la \ - libsystemd-dump.la \ - libsystemd-capability.la \ $(GLIB_LIBS) \ - $(DBUS_LIBS) \ - $(CAP_LIBS) + $(DBUS_LIBS) test_bus_marshal_CFLAGS = \ $(AM_CFLAGS) \ $(GLIB_CFLAGS) \ - $(DBUS_CFLAGS) \ - $(CAP_CFLAGS) + $(DBUS_CFLAGS) test_bus_signature_SOURCES = \ src/libsystemd/sd-bus/test-bus-signature.c @@ -2742,15 +2847,12 @@ test_bus_objects_SOURCES = \ test_bus_objects_CFLAGS = \ $(AM_CFLAGS) \ - $(CAP_CFLAGS) \ -pthread test_bus_objects_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) + libsystemd-internal.la \ + libsystemd-shared.la test_bus_error_SOURCES = \ src/libsystemd/sd-bus/test-bus-error.c @@ -2763,26 +2865,22 @@ test_bus_gvariant_SOURCES = \ src/libsystemd/sd-bus/test-bus-gvariant.c test_bus_gvariant_LDADD = \ + libsystemd-dump.la \ libsystemd-internal.la \ libsystemd-shared.la \ - libsystemd-dump.la \ - libsystemd-capability.la \ - $(GLIB_LIBS) \ - $(CAP_LIBS) + $(GLIB_LIBS) test_bus_gvariant_CFLAGS = \ $(AM_CFLAGS) \ $(GLIB_CFLAGS) - $(CAP_CFLAGS) test_bus_creds_SOURCES = \ src/libsystemd/sd-bus/test-bus-creds.c test_bus_creds_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la + libsystemd-internal.la \ + libsystemd-shared.la test_bus_match_SOURCES = \ src/libsystemd/sd-bus/test-bus-match.c @@ -2795,15 +2893,9 @@ test_bus_kernel_SOURCES = \ src/libsystemd/sd-bus/test-bus-kernel.c test_bus_kernel_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) - -test_bus_kernel_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) + libsystemd-internal.la \ + libsystemd-shared.la test_bus_kernel_bloom_SOURCES = \ src/libsystemd/sd-bus/test-bus-kernel-bloom.c @@ -2823,15 +2915,9 @@ test_bus_zero_copy_SOURCES = \ src/libsystemd/sd-bus/test-bus-zero-copy.c test_bus_zero_copy_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) - -test_bus_zero_copy_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) + libsystemd-internal.la \ + libsystemd-shared.la test_bus_introspect_SOURCES = \ src/libsystemd/sd-bus/test-bus-introspect.c @@ -2867,18 +2953,14 @@ test_resolve_CFLAGS = \ -pthread busctl_SOURCES = \ - src/libsystemd/sd-bus/busctl.c + src/libsystemd/sd-bus/busctl.c \ + src/libsystemd/sd-bus/busctl-introspect.c \ + src/libsystemd/sd-bus/busctl-introspect.h busctl_LDADD = \ - libsystemd-internal.la \ - libsystemd-shared.la \ libsystemd-dump.la \ - libsystemd-capability.la \ - $(CAP_LIBS) - -busctl_CFLAGS = \ - $(AM_CFLAGS) \ - $(CAP_CFLAGS) + libsystemd-internal.la \ + libsystemd-shared.la # ------------------------------------------------------------------------------ noinst_LTLIBRARIES += \ @@ -2896,6 +2978,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 \ @@ -2910,6 +2993,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 \ @@ -2969,6 +3053,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 \ @@ -2998,21 +3090,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 \ @@ -3036,13 +3141,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 = \ @@ -3051,6 +3158,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) @@ -3214,6 +3340,7 @@ dist_udevrules_DATA += \ rules/50-udev-default.rules \ rules/60-drm.rules \ rules/60-keyboard.rules \ + rules/70-mouse.rules \ rules/60-persistent-storage-tape.rules \ rules/60-persistent-serial.rules \ rules/60-persistent-input.rules \ @@ -3240,7 +3367,8 @@ dist_udevhwdb_DATA = \ hwdb/20-acpi-vendor.hwdb \ hwdb/20-OUI.hwdb \ hwdb/20-net-ifname.hwdb \ - hwdb/60-keyboard.hwdb + hwdb/60-keyboard.hwdb \ + hwdb/70-mouse.hwdb udevconfdir = $(sysconfdir)/udev dist_udevconf_DATA = \ @@ -3391,7 +3519,9 @@ udevadm_SOURCES = \ src/udev/udevadm-settle.c \ src/udev/udevadm-trigger.c \ src/udev/udevadm-test.c \ - src/udev/udevadm-test-builtin.c + src/udev/udevadm-test-builtin.c \ + src/udev/udevadm-util.c \ + src/udev/udevadm-util.h udevadm_LDADD = \ libudev-core.la @@ -3428,7 +3558,7 @@ test_udev_SOURCES = \ src/test/test-udev.c test_udev_LDADD = \ - libudev-core.la \ + libudev-core.la \ $(BLKID_LIBS) \ $(KMOD_LIBS) \ $(SELINUX_LIBS) @@ -3763,6 +3893,16 @@ systemd_journal_remote_CFLAGS = \ systemd_journal_remote_LDADD += \ $(MICROHTTPD_LIBS) +if ENABLE_SYSUSERS +dist_sysusers_DATA += \ + sysusers.d/systemd-remote.conf +endif + +if ENABLE_TMPFILES +dist_tmpfiles_DATA += \ + tmpfiles.d/systemd-remote.conf +endif + if HAVE_GNUTLS systemd_journal_remote_LDADD += \ $(GNUTLS_LIBS) @@ -3810,7 +3950,6 @@ systemd_journal_upload_CFLAGS = \ $(LIBCURL_CFLAGS) systemd_journal_upload_LDADD = \ - libsystemd-core.la \ libsystemd-internal.la \ libsystemd-journal-internal.la \ libsystemd-shared.la \ @@ -3967,6 +4106,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 @@ -3977,7 +4118,6 @@ nodist_libsystemd_journal_core_la_SOURCES = \ libsystemd_journal_core_la_LIBADD = \ libsystemd-journal-internal.la \ libudev-internal.la \ - libsystemd-capability.la \ libsystemd-label.la \ libsystemd-internal.la \ libsystemd-shared.la @@ -4118,7 +4258,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 \ @@ -4130,13 +4271,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 \ @@ -4327,6 +4470,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 @@ -4549,7 +4695,12 @@ systemd_localed_SOURCES = \ systemd_localed_LDADD = \ libsystemd-label.la \ libsystemd-internal.la \ - libsystemd-shared.la + libsystemd-shared.la \ + $(XKBCOMMON_LIBS) + +systemd_localed_CFLAGS = \ + $(AM_CFLAGS) \ + $(XKBCOMMON_CFLAGS) nodist_systemunit_DATA += \ units/systemd-localed.service @@ -4688,7 +4839,6 @@ systemd_timesyncd_LDADD = \ libsystemd-resolve.la \ libsystemd-network.la \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ -lm @@ -4889,7 +5039,6 @@ CLEANFILES += \ src/resolve/resolved-gperf.c systemd_resolved_LDADD = \ - libsystemd-capability.la \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ @@ -4942,7 +5091,6 @@ test_dns_domain_SOURCES = \ src/resolve/test-dns-domain.c test_dns_domain_LDADD = \ - libsystemd-capability.la \ libsystemd-network.la \ libsystemd-label.la \ libsystemd-internal.la \ @@ -5006,8 +5154,7 @@ systemd_networkd_SOURCES = \ src/network/networkd.c systemd_networkd_LDADD = \ - libsystemd-networkd-core.la \ - libsystemd-capability.la + libsystemd-networkd-core.la noinst_LTLIBRARIES += \ libsystemd-networkd-core.la @@ -5094,9 +5241,6 @@ networkctl_LDADD = \ test_network_SOURCES = \ src/network/test-network.c -test_network_CFLAGS = \ - $(AM_CFLAGS) - test_network_LDADD = \ libsystemd-networkd-core.la @@ -5169,7 +5313,6 @@ libsystemd_logind_core_la_SOURCES = \ libsystemd_logind_core_la_LIBADD = \ libsystemd-label.la \ - libsystemd-capability.la \ libsystemd-internal.la \ libudev-internal.la \ libsystemd-shared.la @@ -5278,7 +5421,6 @@ pam_systemd_la_LDFLAGS = \ -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym pam_systemd_la_LIBADD = \ - libsystemd-capability.la \ libsystemd-internal.la \ libsystemd-shared.la \ $(PAM_LIBS) @@ -5325,20 +5467,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 @@ -5746,6 +5874,10 @@ src/%: src/%.m4 $(AM_V_at)$(MKDIR_P) $(dir $@) $(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@ +sysusers.d/%: sysusers.d/%.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) < $< > $@ @@ -5858,6 +5990,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 @@ -5872,7 +6005,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 += \ @@ -6183,3 +6319,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