X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=4593245d40538629ebb3f282cd5a1660c4bf3d0d;hp=0ac99a68893c4f072df9cb0434cca905bdcf8ccd;hb=6c12b52e19640747e96f89d85422941a23dc6b29;hpb=a7739f8f973b1a57ee0f8a9404a7c8ed375f2197 diff --git a/Makefile.am b/Makefile.am index 0ac99a688..4593245d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -222,6 +222,7 @@ install-target-wants-hook: what="$(SYSINIT_TARGET_WANTS)" && wants=sysinit.target && $(add-wants) what="$(SOCKETS_TARGET_WANTS)" && wants=sockets.target && $(add-wants) what="$(TIMERS_TARGET_WANTS)" && wants=timers.target && $(add-wants) + what="$(SLICES_TARGET_WANTS)" && wants=slices.target && $(add-wants) define add-wants [ -z "$$what" ] || ( \ @@ -280,7 +281,6 @@ rootbin_PROGRAMS = \ systemd-notify \ systemd-ask-password \ systemd-tty-ask-password-agent \ - systemd-tmpfiles \ systemd-machine-id-setup bin_PROGRAMS = \ @@ -290,7 +290,8 @@ bin_PROGRAMS = \ systemd-nspawn \ systemd-detect-virt \ systemd-delta \ - systemd-analyze + systemd-analyze \ + systemd-run dist_bin_SCRIPTS = \ src/kernel-install/kernel-install @@ -336,19 +337,9 @@ dist_bashcompletion_DATA = \ shell-completion/bash/systemd-analyze \ shell-completion/bash/udevadm -dist_tmpfiles_DATA = \ - tmpfiles.d/systemd.conf \ - tmpfiles.d/tmp.conf \ - tmpfiles.d/x11.conf - dist_sysctl_DATA = \ sysctl.d/50-default.conf -if HAVE_SYSV_COMPAT -dist_tmpfiles_DATA += \ - tmpfiles.d/legacy.conf -endif - dist_systemunit_DATA = \ units/graphical.target \ units/multi-user.target \ @@ -387,6 +378,9 @@ dist_systemunit_DATA = \ units/paths.target \ units/suspend.target \ units/swap.target \ + units/slices.target \ + units/system.slice \ + units/-.slice \ units/systemd-initctl.socket \ units/systemd-shutdownd.socket \ units/syslog.socket \ @@ -400,8 +394,6 @@ dist_systemunit_DATA = \ units/sound.target \ units/bluetooth.target \ units/smartcard.target \ - units/systemd-tmpfiles-clean.timer \ - units/quotaon.service \ units/systemd-ask-password-wall.path \ units/systemd-ask-password-console.path \ units/systemd-udevd-control.socket \ @@ -417,11 +409,8 @@ 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-update-utmp-shutdown.service \ - units/systemd-tmpfiles-setup-dev.service \ - units/systemd-tmpfiles-setup.service \ - units/systemd-tmpfiles-clean.service \ units/systemd-ask-password-wall.service \ units/systemd-ask-password-console.service \ units/systemd-sysctl.service \ @@ -463,11 +452,8 @@ EXTRA_DIST += \ units/systemd-initctl.service.in \ units/systemd-shutdownd.service.in \ units/systemd-remount-fs.service.in \ + units/systemd-update-utmp.service.in \ units/systemd-update-utmp-runlevel.service.in \ - units/systemd-update-utmp-shutdown.service.in \ - units/systemd-tmpfiles-setup-dev.service.in \ - units/systemd-tmpfiles-setup.service.in \ - units/systemd-tmpfiles-clean.service.in \ units/systemd-ask-password-wall.service.in \ units/systemd-ask-password-console.service.in \ units/systemd-sysctl.service.in \ @@ -530,6 +516,9 @@ MANPAGES_ALIAS = include Makefile-man.am +.PHONY: man +man: $(MANPAGES) $(MANPAGES_ALIAS) $(HTML_FILES) $(HTML_ALIAS) + XML_FILES = \ ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}} HTML_FILES = \ @@ -695,7 +684,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/fileio.h \ src/shared/output-mode.h \ src/shared/MurmurHash3.c \ - src/shared/MurmurHash3.h + src/shared/MurmurHash3.h \ + src/shared/refcnt.h #------------------------------------------------------------------------------- noinst_LTLIBRARIES += \ @@ -858,6 +848,10 @@ libsystemd_core_la_SOURCES = \ src/core/timer.h \ src/core/path.c \ src/core/path.h \ + src/core/slice.c \ + src/core/slice.h \ + src/core/scope.c \ + src/core/scope.h \ src/core/load-dropin.c \ src/core/load-dropin.h \ src/core/execute.c \ @@ -890,12 +884,18 @@ libsystemd_core_la_SOURCES = \ src/core/dbus-snapshot.h \ src/core/dbus-device.c \ src/core/dbus-device.h \ + src/core/dbus-path.c \ + src/core/dbus-path.h \ + src/core/dbus-slice.c \ + src/core/dbus-slice.h \ + src/core/dbus-scope.c \ + src/core/dbus-scope.h \ src/core/dbus-execute.c \ src/core/dbus-execute.h \ src/core/dbus-kill.c \ src/core/dbus-kill.h \ - src/core/dbus-path.c \ - src/core/dbus-path.h \ + src/core/dbus-cgroup.c \ + src/core/dbus-cgroup.h \ src/core/cgroup.c \ src/core/cgroup.h \ src/core/selinux-access.c \ @@ -922,10 +922,6 @@ libsystemd_core_la_SOURCES = \ src/core/namespace.h \ src/core/tcpwrap.c \ src/core/tcpwrap.h \ - src/core/cgroup-attr.c \ - src/core/cgroup-attr.h \ - src/core/cgroup-semantics.c \ - src/core/cgroup-semantics.h \ src/core/securebits.h \ src/core/initreq.h \ src/core/special.h \ @@ -1107,7 +1103,8 @@ tests += \ test-prioq \ test-fileio \ test-time \ - test-hashmap + test-hashmap \ + test-list EXTRA_DIST += \ test/sched_idle_bad.service \ @@ -1145,6 +1142,10 @@ test_ns_SOURCES = \ test_ns_LDADD = \ libsystemd-core.la +test_ns_CFLAGS = \ + $(AM_CFLAGS) \ + $(DBUS_CFLAGS) + test_loopback_SOURCES = \ src/test/test-loopback.c @@ -1207,6 +1208,15 @@ test_hashmap_CFLAGS = \ test_hashmap_LDADD = \ libsystemd-core.la +test_list_SOURCES = \ + src/test/test-list.c + +test_list_CFLAGS = \ + $(AM_CFLAGS) + +test_list_LDADD = \ + libsystemd-core.la + test_prioq_SOURCES = \ src/test/test-prioq.c @@ -1436,6 +1446,7 @@ EXTRA_DIST += \ units/systemd-modules-load.service.in # ------------------------------------------------------------------------------ +if ENABLE_TMPFILES systemd_tmpfiles_SOURCES = \ src/tmpfiles/tmpfiles.c @@ -1444,6 +1455,44 @@ systemd_tmpfiles_LDADD = \ libsystemd-shared.la \ libsystemd-capability.la +rootbin_PROGRAMS += \ + systemd-tmpfiles + +dist_systemunit_DATA += \ + units/systemd-tmpfiles-clean.timer + +nodist_systemunit_DATA += \ + units/systemd-tmpfiles-setup-dev.service \ + units/systemd-tmpfiles-setup.service \ + units/systemd-tmpfiles-clean.service + +dist_tmpfiles_DATA = \ + tmpfiles.d/systemd.conf \ + tmpfiles.d/tmp.conf \ + tmpfiles.d/x11.conf + +if HAVE_SYSV_COMPAT +dist_tmpfiles_DATA += \ + tmpfiles.d/legacy.conf +endif + +SYSINIT_TARGET_WANTS += \ + systemd-tmpfiles-setup-dev.service \ + systemd-tmpfiles-setup.service + +TIMERS_TARGET_WANTS += \ + systemd-tmpfiles-clean.timer + +INSTALL_DIRS += \ + $(tmpfilesdir) \ + $(sysconfdir)/tmpfiles.d +endif + +EXTRA_DIST += \ + units/systemd-tmpfiles-setup-dev.service.in \ + units/systemd-tmpfiles-setup.service.in \ + units/systemd-tmpfiles-clean.service.in + # ------------------------------------------------------------------------------ systemd_machine_id_setup_SOURCES = \ src/machine-id-setup/machine-id-setup-main.c \ @@ -1542,8 +1591,8 @@ systemd_system_update_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -# ------------------------------------------------------------------------------ if ENABLE_EFI +# ------------------------------------------------------------------------------ systemgenerator_PROGRAMS += \ systemd-efi-boot-generator @@ -1553,6 +1602,22 @@ systemd_efi_boot_generator_SOURCES = \ systemd_efi_boot_generator_LDADD = \ libsystemd-label.la \ libsystemd-shared.la + +# ------------------------------------------------------------------------------ +bootctl_SOURCES = \ + src/boot/boot.h \ + src/boot/boot-loader.h \ + src/boot/bootctl.c \ + src/boot/boot-loader.c \ + src/boot/boot-efi.c + +bootctl_LDADD = \ + libsystemd-shared.la \ + libsystemd-id128.la \ + libsystemd-daemon.la + +bin_PROGRAMS += \ + bootctl endif # ------------------------------------------------------------------------------ @@ -1652,7 +1717,20 @@ systemd_nspawn_LDADD = \ libsystemd-capability.la \ libsystemd-shared.la \ libsystemd-daemon.la \ - libsystemd-id128-internal.la + libsystemd-id128-internal.la \ + libsystemd-bus.la + +# ------------------------------------------------------------------------------ +systemd_run_SOURCES = \ + src/run/run.c + +systemd_run_LDADD = \ + libsystemd-label.la \ + libsystemd-capability.la \ + libsystemd-shared.la \ + libsystemd-daemon.la \ + libsystemd-id128-internal.la \ + libsystemd-bus.la # ------------------------------------------------------------------------------ systemd_stdio_bridge_SOURCES = \ @@ -1718,6 +1796,7 @@ EXTRA_DIST += \ libsystemd_bus_la_SOURCES = \ src/systemd/sd-bus.h \ src/systemd/sd-bus-protocol.h \ + src/systemd/sd-memfd.h \ src/libsystemd-bus/sd-bus.c \ src/libsystemd-bus/bus-control.c \ src/libsystemd-bus/bus-control.h \ @@ -1739,13 +1818,18 @@ libsystemd_bus_la_SOURCES = \ src/libsystemd-bus/bus-match.h \ src/libsystemd-bus/bus-bloom.c \ src/libsystemd-bus/bus-bloom.h \ - src/libsystemd-bus/kdbus.h + src/libsystemd-bus/kdbus.h \ + src/libsystemd-bus/sd-memfd.c libsystemd_bus_la_LIBADD = \ libsystemd-id128-internal.la \ libsystemd-shared.la \ libsystemd-daemon.la +libsystemd_bus_la_CFLAGS = \ + $(AM_CFLAGS) \ + -pthread + noinst_LTLIBRARIES += \ libsystemd-bus.la @@ -1755,7 +1839,11 @@ tests += \ test-bus-chat \ test-bus-server \ test-bus-match \ - test-bus-kernel + test-bus-kernel \ + test-bus-kernel-bloom \ + test-bus-kernel-benchmark \ + test-bus-memfd \ + test-bus-zero-copy noinst_PROGRAMS += \ busctl @@ -1827,6 +1915,48 @@ test_bus_kernel_LDADD = \ libsystemd-bus.la \ libsystemd-id128-internal.la +test_bus_kernel_bloom_SOURCES = \ + src/libsystemd-bus/test-bus-kernel-bloom.c + +test_bus_kernel_bloom_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_kernel_bloom_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + +test_bus_kernel_benchmark_SOURCES = \ + src/libsystemd-bus/test-bus-kernel-benchmark.c + +test_bus_kernel_benchmark_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_kernel_benchmark_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la \ + libsystemd-id128-internal.la + +test_bus_memfd_SOURCES = \ + src/libsystemd-bus/test-bus-memfd.c + +test_bus_memfd_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_memfd_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + +test_bus_zero_copy_SOURCES = \ + src/libsystemd-bus/test-bus-zero-copy.c + +test_bus_zero_copy_CFLAGS = \ + $(AM_CFLAGS) + +test_bus_zero_copy_LDADD = \ + libsystemd-shared.la \ + libsystemd-bus.la + busctl_SOURCES = \ src/libsystemd-bus/busctl.c @@ -1873,6 +2003,7 @@ libudev_la_LDFLAGS = \ libudev_la_LIBADD = \ libsystemd-shared.la \ + libsystemd-label.la \ libsystemd-daemon-internal.la \ libsystemd-id128-internal.la @@ -2452,6 +2583,7 @@ dist_udevkeymap_DATA = \ keymaps/lenovo-thinkpad_x6_tablet \ keymaps/lenovo-thinkpad_x200_tablet \ keymaps/lg-x110 \ + keymaps/logitech-usb \ keymaps/logitech-wave \ keymaps/logitech-wave-cordless \ keymaps/logitech-wave-pro-cordless \ @@ -2471,6 +2603,7 @@ dist_udevkeymap_DATA = \ keymaps/oqo-model2 \ keymaps/samsung-other \ keymaps/samsung-series-9 \ + keymaps/samsung-series-3 \ keymaps/samsung-sq1us \ keymaps/samsung-sx20s \ keymaps/toshiba-satellite_a100 \ @@ -2485,6 +2618,7 @@ dist_udevkeymapforcerel_DATA = \ keymaps-force-release/hp-other \ keymaps-force-release/samsung-other \ keymaps-force-release/samsung-series-9 \ + keymaps-force-release/samsung-series-3 \ keymaps-force-release/common-volume-keys src/udev/keymap/keys.txt: Makefile @@ -2535,6 +2669,7 @@ libsystemd_id128_la_LDFLAGS = \ libsystemd_id128_la_LIBADD = \ libsystemd-shared.la \ + libsystemd-label.la \ libsystemd-daemon-internal.la libsystemd_id128_internal_la_SOURCES = \ @@ -2690,6 +2825,14 @@ test_journal_verify_LDADD = \ libsystemd-journal-internal.la \ libsystemd-id128-internal.la +test_journal_interleaving_SOURCES = \ + src/journal/test-journal-interleaving.c + +test_journal_interleaving_LDADD = \ + libsystemd-shared.la \ + libsystemd-journal-internal.la \ + libsystemd-id128-internal.la + test_mmap_cache_SOURCES = \ src/journal/test-mmap-cache.c @@ -2865,6 +3008,7 @@ tests += \ test-journal-match \ test-journal-stream \ test-journal-verify \ + test-journal-interleaving \ test-mmap-cache \ test-catalog @@ -3138,8 +3282,7 @@ rootlibexec_PROGRAMS += \ systemd-random-seed nodist_systemunit_DATA += \ - units/systemd-random-seed-save.service \ - units/systemd-random-seed-load.service + units/systemd-random-seed.service systemd_random_seed_SOURCES = \ src/random-seed/random-seed.c @@ -3148,16 +3291,13 @@ systemd_random_seed_LDADD = \ libsystemd-label.la \ libsystemd-shared.la -SHUTDOWN_TARGET_WANTS += \ - systemd-random-seed-save.service SYSINIT_TARGET_WANTS += \ - systemd-random-seed-load.service + systemd-random-seed.service endif EXTRA_DIST += \ - units/systemd-random-seed-save.service.in \ - units/systemd-random-seed-load.service.in + units/systemd-random-seed.service.in # ------------------------------------------------------------------------------ if HAVE_LIBCRYPTSETUP @@ -3407,24 +3547,6 @@ polkitpolicy_in_files += \ EXTRA_DIST += \ units/systemd-timedated.service.in -# ------------------------------------------------------------------------------ -if ENABLE_EFI -bootctl_SOURCES = \ - src/boot/boot.h \ - src/boot/boot-loader.h \ - src/boot/bootctl.c \ - src/boot/boot-loader.c \ - src/boot/boot-efi.c - -bootctl_LDADD = \ - libsystemd-shared.la \ - libsystemd-id128.la \ - libsystemd-daemon.la - -bin_PROGRAMS += \ - bootctl -endif - # ------------------------------------------------------------------------------ if HAVE_MYHOSTNAME libnss_myhostname_la_SOURCES = \ @@ -3463,6 +3585,8 @@ systemd_logind_SOURCES = \ src/login/logind-seat.h \ src/login/logind-session.c \ src/login/logind-session.h \ + src/login/logind-machine.c \ + src/login/logind-machine.h \ src/login/logind-user.c \ src/login/logind-user.h \ src/login/logind-inhibit.c \ @@ -3470,6 +3594,7 @@ systemd_logind_SOURCES = \ src/login/logind-session-dbus.c \ src/login/logind-seat-dbus.c \ src/login/logind-user-dbus.c \ + src/login/logind-machine-dbus.c \ src/login/logind-acl.h nodist_systemd_logind_SOURCES = \ @@ -3485,6 +3610,7 @@ systemd_logind_LDADD = \ libsystemd-shared.la \ libsystemd-daemon.la \ libsystemd-dbus.la \ + libsystemd-id128-internal.la \ libudev.la if HAVE_ACL @@ -3622,6 +3748,10 @@ nodist_systemunit_DATA += \ units/systemd-logind.service \ units/systemd-user-sessions.service +dist_systemunit_DATA += \ + units/user.slice \ + units/machine.slice + dist_dbussystemservice_DATA += \ src/login/org.freedesktop.login1.service @@ -4050,8 +4180,8 @@ RUNLEVEL4_TARGET_WANTS += \ RUNLEVEL5_TARGET_WANTS += \ systemd-update-utmp-runlevel.service endif -SHUTDOWN_TARGET_WANTS += \ - systemd-update-utmp-shutdown.service +SYSINIT_TARGET_WANTS += \ + systemd-update-utmp.service LOCAL_FS_TARGET_WANTS += \ systemd-remount-fs.service \ systemd-fsck-root.service \ @@ -4065,12 +4195,8 @@ SYSINIT_TARGET_WANTS += \ sys-kernel-config.mount \ sys-kernel-debug.mount \ sys-fs-fuse-connections.mount \ - systemd-tmpfiles-setup-dev.service \ - systemd-tmpfiles-setup.service \ systemd-sysctl.service \ systemd-ask-password-console.path -TIMERS_TARGET_WANTS += \ - systemd-tmpfiles-clean.timer if HAVE_SYSV_COMPAT SYSTEM_UNIT_ALIASES += \ @@ -4114,8 +4240,6 @@ INSTALL_DIRS += \ endif INSTALL_DIRS += \ - $(tmpfilesdir) \ - $(sysconfdir)/tmpfiles.d \ $(prefix)/lib/modules-load.d \ $(sysconfdir)/modules-load.d \ $(prefix)/lib/sysctl.d \