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
.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
dist_pkgdata_DATA =
dist_dbuspolicy_DATA =
dist_dbussystemservice_DATA =
+dist_systemunit_DATA_busnames =
check_PROGRAMS =
check_DATA =
tests=
BUSNAMES_TARGET_WANTS =
TIMERS_TARGET_WANTS =
USER_SOCKETS_TARGET_WANTS =
+USER_DEFAULT_TARGET_WANTS =
USER_BUSNAMES_TARGET_WANTS =
SYSTEM_UNIT_ALIASES =
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
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))
systemd \
systemd-cgroups-agent \
systemd-initctl \
- systemd-update-utmp \
systemd-shutdownd \
systemd-shutdown \
systemd-remount-fs \
systemd-sleep \
systemd-bus-proxyd \
systemd-socket-proxyd \
- systemd-update-done \
- systemd-hibernate-resume
+ systemd-update-done
+
+if HAVE_UTMP
+rootlibexec_PROGRAMS += \
+ systemd-update-utmp
+endif
systemgenerator_PROGRAMS = \
systemd-getty-generator \
systemd-fstab-generator \
systemd-system-update-generator \
- systemd-debug-generator \
- systemd-hibernate-resume-generator
+ systemd-debug-generator
dist_bashcompletion_DATA = \
shell-completion/bash/busctl \
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 \
units/sigpwr.target \
units/sleep.target \
units/sockets.target \
- units/busnames.target \
units/timers.target \
units/paths.target \
units/suspend.target \
units/system-update.target \
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 \
units/serial-getty@.service \
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 \
units/initrd-udevadm-cleanup-db.service \
units/initrd-switch-root.service \
units/systemd-nspawn@.service \
- units/systemd-update-done.service \
- units/systemd-hibernate-resume@.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/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 \
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 \
units/initrd-udevadm-cleanup-db.service.in \
units/initrd-switch-root.service.in \
units/systemd-nspawn@.service.in \
- units/systemd-update-done.service.in \
- units/systemd-hibernate-resume@.service.in
+ units/systemd-update-done.service.in
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
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 \
$(man_MANS) \
tools/make-man-index.py \
tools/make-directive-index.py \
- tools/make-man-rules.py \
tools/xml_helper.py
# ------------------------------------------------------------------------------
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/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/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 \
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/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/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 \
test-fileio \
test-time \
test-hashmap \
+ test-set \
test-list \
test-tables \
test-device-nodes \
test-async \
test-ratelimit \
test-condition-util \
- test-uid-range
+ test-uid-range \
+ test-bus-policy
EXTRA_DIST += \
test/a.service \
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
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
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
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
systemd_delta_LDADD = \
libsystemd-shared.la
-# ------------------------------------------------------------------------------
-systemd_hibernate_resume_SOURCES = \
- src/hibernate-resume/hibernate-resume.c
-
-systemd_hibernate_resume_LDADD = \
- libsystemd-internal.la \
- libsystemd-shared.la
-
# ------------------------------------------------------------------------------
systemd_getty_generator_SOURCES = \
src/getty-generator/getty-generator.c
libsystemd-shared.la
# ------------------------------------------------------------------------------
+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/resume-generator/resume-generator.c
+ src/hibernate-resume/hibernate-resume-generator.c
systemd_hibernate_resume_generator_LDADD = \
libsystemd-label.la \
libsystemd-shared.la
-if ENABLE_EFI
+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
# ------------------------------------------------------------------------------
systemd_notify_SOURCES = \
- src/notify/notify.c \
- src/readahead/sd-readahead.c
+ src/notify/notify.c
systemd_notify_LDADD = \
libsystemd-internal.la \
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 = \
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 \
$(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/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 = \
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)
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
$(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
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 += \
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 = \
nodist_systemunit_DATA += \
units/systemd-hostnamed.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.hostname1.busname
dist_dbuspolicy_DATA += \
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
nodist_systemunit_DATA += \
units/systemd-localed.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.locale1.busname
rootlibexec_PROGRAMS += \
nodist_systemunit_DATA += \
units/systemd-timedated.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.timedate1.busname
polkitpolicy_files += \
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 += \
nodist_systemunit_DATA += \
units/systemd-resolved.service
-dist_systemunit_DATA += \
+dist_systemunit_DATA_busnames += \
units/org.freedesktop.resolve1.busname
dist_dbuspolicy_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 += \
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
systemd-initctl.socket \
systemd-shutdownd.socket
+if HAVE_UTMP
if HAVE_SYSV_COMPAT
RUNLEVEL1_TARGET_WANTS += \
systemd-update-utmp-runlevel.service
endif
SYSINIT_TARGET_WANTS += \
- systemd-update-utmp.service \
+ systemd-update-utmp.service
+endif
+
+SYSINIT_TARGET_WANTS += \
systemd-update-done.service
LOCAL_FS_TARGET_WANTS += \
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 \
$(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 \
~ianmdlvl / elogind.git / blobdiff