LIBUDEV_REVISION=4
LIBUDEV_AGE=6
-LIBSYSTEMD_CURRENT=9
+LIBSYSTEMD_CURRENT=12
LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=9
+LIBSYSTEMD_AGE=12
# The following four libraries only exist for compatibility reasons,
# their version info should not be bumped anymore
TESTS =
endif
udevlibexec_PROGRAMS =
+gperf_gperf_sources =
in_files = $(filter %.in,$(EXTRA_DIST))
in_in_files = $(filter %.in.in, $(in_files))
-I $(top_builddir)/src/journal \
-I $(top_srcdir)/src/timedate \
-I $(top_srcdir)/src/timesync \
+ -I $(top_srcdir)/src/nspawn \
-I $(top_srcdir)/src/resolve \
-I $(top_builddir)/src/resolve \
-I $(top_srcdir)/src/systemd \
-I $(top_srcdir)/src/libsystemd/sd-hwdb \
-I $(top_srcdir)/src/libsystemd/sd-device \
-I $(top_srcdir)/src/libsystemd-network \
- -I $(top_srcdir)/src/libsystemd-terminal \
$(OUR_CPPFLAGS)
AM_CFLAGS = $(OUR_CFLAGS)
systemd-remount-fs \
systemd-reply-password \
systemd-fsck \
- systemd-machine-id-commit \
systemd-ac-power \
systemd-sysctl \
systemd-sleep \
systemd-system-update-generator \
systemd-debug-generator
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA = \
shell-completion/bash/busctl \
shell-completion/bash/journalctl \
nodist_bashcompletion_DATA = \
shell-completion/bash/systemctl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA = \
shell-completion/zsh/_busctl \
shell-completion/zsh/_journalctl \
nodist_zshcompletion_DATA = \
shell-completion/zsh/_systemctl
+endif
EXTRA_DIST += \
shell-completion/bash/systemctl.in \
units/getty.target \
units/halt.target \
units/kexec.target \
+ units/exit.target \
units/local-fs.target \
units/local-fs-pre.target \
units/initrd.target \
units/systemd-poweroff.service \
units/systemd-reboot.service \
units/systemd-kexec.service \
+ units/systemd-exit.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
units/systemd-machine-id-commit.service \
units/systemd-poweroff.service.in \
units/systemd-reboot.service.in \
units/systemd-kexec.service.in \
+ units/systemd-exit.service.in \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.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-update-done.service.in \
+ units/tmp.mount.m4
if HAVE_SYSV_COMPAT
nodist_systemunit_DATA += \
dist_doc_DATA = \
README \
- README.md \
NEWS \
CODING_STYLE \
LICENSE.LGPL2.1 \
DISTRO_PORTING \
src/libsystemd/sd-bus/PORTING-DBUS1 \
src/libsystemd/sd-bus/DIFFERENCES \
- src/libsystemd/sd-bus/GVARIANT-SERIALIZATION \
+ src/libsystemd/sd-bus/GVARIANT-SERIALIZATION
+
+EXTRA_DIST += \
+ README.md \
autogen.sh \
.dir-locals.el \
.vimrc \
src/basic/refcnt.h \
src/basic/util.c \
src/basic/util.h \
+ src/basic/io-util.c \
+ src/basic/io-util.h \
+ src/basic/string-util.c \
+ src/basic/string-util.h \
+ src/basic/fd-util.c \
+ src/basic/fd-util.h \
+ src/basic/extract-word.c \
+ src/basic/extract-word.h \
+ src/basic/escape.c \
+ src/basic/escape.h \
+ src/basic/cpu-set-util.c \
+ src/basic/cpu-set-util.h \
src/basic/lockfile-util.c \
src/basic/lockfile-util.h \
src/basic/path-util.c \
src/basic/siphash24.h \
src/basic/set.h \
src/basic/ordered-set.h \
+ src/basic/bitmap.c \
+ src/basic/bitmap.h \
src/basic/fdset.c \
src/basic/fdset.h \
src/basic/prioq.c \
src/basic/xml.h \
src/basic/json.c \
src/basic/json.h \
- src/basic/ring.c \
- src/basic/ring.h \
src/basic/barrier.c \
src/basic/barrier.h \
src/basic/async.c \
src/basic/rm-rf.c \
src/basic/rm-rf.h \
src/basic/copy.c \
- src/basic/copy.h
+ src/basic/copy.h \
+ src/basic/formats-util.h
nodist_libbasic_la_SOURCES = \
src/basic/errno-from-name.h \
libbasic_la_LIBADD = \
$(SELINUX_LIBS) \
$(CAP_LIBS) \
- -ldl \
-lrt \
-lm
src/shared/architecture.h \
src/shared/efivars.c \
src/shared/efivars.h \
- src/shared/formats-util.h \
src/shared/fstab-util.c \
src/shared/fstab-util.h \
src/shared/sleep-config.c \
src/shared/ima-util.h \
src/shared/ptyfwd.c \
src/shared/ptyfwd.h \
- src/shared/pty.c \
- src/shared/pty.h \
src/shared/base-filesystem.c \
src/shared/base-filesystem.h \
src/shared/uid-range.c \
$(gperf_gperf_m4_sources:-gperf.gperf.m4=-gperf-nulstr.c) \
$(gperf_gperf_sources:-gperf.gperf=-gperf.c) \
$(gperf_txt_sources:-list.txt=-from-name.h) \
- $(gperf_txt_sources:-list.txt=-to-name.h)
+ $(filter-out %keyboard-keys-to-name.h,$(gperf_txt_sources:-list.txt=-to-name.h))
CLEANFILES += \
$(gperf_txt_sources:-list.txt=-from-name.gperf)
systemd_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
systemd_LDADD = \
libcore.la
test-watchdog \
test-log \
test-ipcrm \
- test-btrfs
+ test-btrfs \
+ test-acd \
+ test-ipv4ll-manual
if HAVE_LIBIPTC
manual_tests += \
test-path \
test-path-util \
test-strxcpyx \
+ test-siphash24 \
test-unit-name \
test-unit-file \
test-utf8 \
test-ellipsize \
test-util \
+ test-hostname-util \
test-process-util \
test-terminal-util \
test-path-lookup \
- test-ring \
test-barrier \
- test-pty \
test-tmpfiles \
test-namespace \
test-date \
test-time \
test-hashmap \
test-set \
+ test-bitmap \
test-list \
test-unaligned \
test-tables \
test-cap-list \
test-sigbus \
test-verbs \
+ test-af-list \
+ test-arphrd-list \
test-dns-domain
EXTRA_DIST += \
test/exec-ignoresigpipe-yes.service \
test/exec-personality-x86-64.service \
test/exec-personality-x86.service \
+ test/exec-personality-s390.service \
test/exec-privatedevices-no.service \
test/exec-privatedevices-yes.service \
test/exec-privatetmp-no.service \
test_engine_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_engine_LDADD = \
libcore.la
test_job_type_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_job_type_LDADD = \
libcore.la
test_unit_name_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_unit_name_LDADD = \
libcore.la
test_unit_file_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_unit_file_LDADD = \
libcore.la
test_util_LDADD = \
libshared.la
+test_hostname_util_SOURCES = \
+ src/test/test-hostname-util.c
+
+test_hostname_util_LDADD = \
+ libshared.la
+
test_process_util_SOURCES = \
src/test/test-process-util.c
test_socket_util_LDADD = \
libshared.la
-test_ring_SOURCES = \
- src/test/test-ring.c
-
-test_ring_LDADD = \
- libshared.la
-
test_barrier_SOURCES = \
src/test/test-barrier.c
test_barrier_LDADD = \
libshared.la
-test_pty_SOURCES = \
- src/test/test-pty.c
-
-test_pty_LDADD = \
- libcore.la
-
test_tmpfiles_SOURCES = \
src/test/test-tmpfiles.c
test_set_LDADD = \
libshared.la
+test_bitmap_SOURCES = \
+ src/test/test-bitmap.c
+
+test_bitmap_LDADD = \
+ libshared.la
+
test_xml_SOURCES = \
src/test/test-xml.c
test_tables_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_tables_LDADD = \
libjournal-core.la \
src/test/test-cgroup-mask.c
test_cgroup_mask_CPPFLAGS = \
- $(AM_CPPFLAGS)
+ $(AM_CPPFLAGS) \
+ $(MOUNT_CFLAGS)
test_cgroup_mask_CFLAGS = \
$(AM_CFLAGS) \
src/test/test-path.c
test_path_CFLAGS = \
- $(AM_CFLAGS)
+ $(AM_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_path_LDADD = \
libcore.la
src/test/test-execute.c
test_execute_CFLAGS = \
- $(AM_CFLAGS)
+ $(AM_CFLAGS) \
+ $(MOUNT_CFLAGS)
test_execute_LDADD = \
libcore.la
+test_siphash24_SOURCES = \
+ src/test/test-siphash24.c
+
+test_siphash24_LDADD = \
+ libshared.la
+
test_strxcpyx_SOURCES = \
src/test/test-strxcpyx.c
src/test/test-sched-prio.c
test_sched_prio_CPPFLAGS = \
- $(AM_CPPFLAGS)
+ $(AM_CPPFLAGS) \
+ $(MOUNT_CFLAGS)
test_sched_prio_CFLAGS = \
$(AM_CFLAGS) \
libbus-proxy-core.la \
libshared.la
+test_af_list_SOURCES = \
+ src/test/test-af-list.c
+
+test_af_list_LDADD = \
+ libbasic.la
+
+test_arphrd_list_SOURCES = \
+ src/test/test-arphrd-list.c
+
+test_arphrd_list_LDADD = \
+ libbasic.la
+
# ------------------------------------------------------------------------------
## .PHONY so it always rebuilds it
.PHONY: coverage lcov-run lcov-report coverage-sync
systemd_analyze_CFLAGS = \
$(AM_CFLAGS) \
- $(SECCOMP_CFLAGS)
+ $(SECCOMP_CFLAGS) \
+ $(MOUNT_CFLAGS)
systemd_analyze_LDADD = \
libcore.la
systemd-tmpfiles-setup-dev.service \
systemd-tmpfiles-setup.service
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_systemd-tmpfiles
+endif
TIMERS_TARGET_WANTS += \
systemd-tmpfiles-clean.timer
systemd_machine_id_setup_LDADD = \
libshared.la
+SYSINIT_TARGET_WANTS += \
+ systemd-machine-id-commit.service
+
# ------------------------------------------------------------------------------
systemd_sysctl_SOURCES = \
src/sysctl/sysctl.c
systemd_fsck_LDADD = \
libshared.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 = \
- libshared.la
-
-SYSINIT_TARGET_WANTS += \
- systemd-machine-id-commit.service
-
# ------------------------------------------------------------------------------
systemd_ac_power_SOURCES = \
src/ac-power/ac-power.c
# ------------------------------------------------------------------------------
if ENABLE_EFI
-systemgenerator_PROGRAMS += \
- systemd-efi-boot-generator
-
-systemd_efi_boot_generator_SOURCES = \
- src/efi-boot-generator/efi-boot-generator.c
-
-systemd_efi_boot_generator_LDADD = \
- libshared.la
-
-# ------------------------------------------------------------------------------
if HAVE_BLKID
bootctl_SOURCES = \
src/boot/bootctl.c
bin_PROGRAMS += \
bootctl
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/bootctl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_bootctl
endif
+endif
# ------------------------------------------------------------------------------
if HAVE_GNUEFI
src/boot/efi/util.h \
src/boot/efi/console.h \
src/boot/efi/graphics.h \
- src/boot/efi/pefile.h
+ src/boot/efi/pefile.h \
+ src/boot/efi/disk.h
systemd_boot_sources = \
src/boot/efi/util.c \
src/boot/efi/console.c \
src/boot/efi/graphics.c \
src/boot/efi/pefile.c \
+ src/boot/efi/disk.c \
src/boot/efi/boot.c
EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers)
stub_headers = \
src/boot/efi/util.h \
src/boot/efi/pefile.h \
+ src/boot/efi/disk.h \
src/boot/efi/graphics.h \
src/boot/efi/splash.h \
src/boot/efi/linux.h
stub_sources = \
src/boot/efi/util.c \
src/boot/efi/pefile.c \
+ src/boot/efi/disk.c \
src/boot/efi/graphics.c \
src/boot/efi/splash.c \
src/boot/efi/linux.c \
# ------------------------------------------------------------------------------
systemd_nspawn_SOURCES = \
src/nspawn/nspawn.c \
+ src/nspawn/nspawn-settings.c \
+ src/nspawn/nspawn-settings.h \
+ src/nspawn/nspawn-mount.c \
+ src/nspawn/nspawn-mount.h \
+ src/nspawn/nspawn-network.c \
+ src/nspawn/nspawn-network.h \
+ src/nspawn/nspawn-expose-ports.c \
+ src/nspawn/nspawn-expose-ports.h \
+ src/nspawn/nspawn-cgroup.c \
+ src/nspawn/nspawn-cgroup.h \
+ src/nspawn/nspawn-register.c \
+ src/nspawn/nspawn-register.h \
+ src/nspawn/nspawn-setuid.c \
+ src/nspawn/nspawn-setuid.h \
src/core/mount-setup.c \
src/core/mount-setup.h \
src/core/loopback-setup.c \
src/core/loopback-setup.h
+nodist_systemd_nspawn_SOURCES = \
+ src/nspawn/nspawn-gperf.c
+
+gperf_gperf_sources += \
+ src/nspawn/nspawn-gperf.gperf
+
systemd_nspawn_CFLAGS = \
$(AM_CFLAGS) \
$(BLKID_CFLAGS) \
test-bus-cleanup \
test-bus-server \
test-bus-match \
+ test-bus-proxy \
test-bus-kernel \
test-bus-kernel-bloom \
test-bus-zero-copy \
test_bus_match_LDADD = \
libshared.la
+test_bus_proxy_SOURCES = \
+ src/libsystemd/sd-bus/test-bus-proxy.c
+
+test_bus_proxy_LDADD = \
+ libshared.la
+
test_bus_kernel_SOURCES = \
src/libsystemd/sd-bus/test-bus-kernel.c
src/systemd/sd-dhcp-server.h \
src/systemd/sd-dhcp-lease.h \
src/systemd/sd-ipv4ll.h \
- src/systemd/sd-icmp6-nd.h \
+ src/systemd/sd-ipv4acd.h \
+ src/systemd/sd-ndisc.h \
src/systemd/sd-dhcp6-client.h \
src/systemd/sd-dhcp6-lease.h \
src/systemd/sd-pppoe.h \
src/libsystemd-network/dhcp-lease-internal.h \
src/libsystemd-network/sd-dhcp-lease.c \
src/libsystemd-network/sd-ipv4ll.c \
- src/libsystemd-network/ipv4ll-network.c \
- src/libsystemd-network/ipv4ll-packet.c \
- src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/sd-ipv4acd.c \
+ src/libsystemd-network/arp-util.h \
+ src/libsystemd-network/arp-util.c \
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 \
+ src/libsystemd-network/sd-ndisc.c \
+ src/libsystemd-network/icmp6-util.h \
+ src/libsystemd-network/icmp6-util.c \
src/libsystemd-network/sd-dhcp6-client.c \
src/libsystemd-network/dhcp6-internal.h \
src/libsystemd-network/dhcp6-protocol.h \
test_ipv4ll_SOURCES = \
src/systemd/sd-ipv4ll.h \
- src/libsystemd-network/ipv4ll-internal.h \
+ src/libsystemd-network/arp-util.h \
src/libsystemd-network/test-ipv4ll.c
test_ipv4ll_LDADD = \
libsystemd-network.la \
libshared.la
+test_ipv4ll_manual_SOURCES = \
+ src/systemd/sd-ipv4ll.h \
+ src/libsystemd-network/test-ipv4ll-manual.c
+
+test_ipv4ll_manual_LDADD = \
+ libsystemd-network.la \
+ libshared.la
+
+test_acd_SOURCES = \
+ src/systemd/sd-ipv4acd.h \
+ src/libsystemd-network/test-acd.c
+
+test_acd_LDADD = \
+ libsystemd-network.la \
+ libshared.la
+
test_pppoe_SOURCES = \
src/systemd/sd-pppoe.h \
src/libsystemd-network/test-pppoe.c
libsystemd-network.la \
libshared.la
-test_icmp6_rs_SOURCES = \
+test_ndisc_rs_SOURCES = \
src/systemd/sd-dhcp6-client.h \
- src/systemd/sd-icmp6-nd.h \
- src/libsystemd-network/dhcp6-internal.h \
- src/libsystemd-network/test-icmp6-rs.c \
+ src/systemd/sd-ndisc.h \
+ src/libsystemd-network/icmp6-util.h \
+ src/libsystemd-network/test-ndisc-rs.c \
src/libsystemd-network/dhcp-identifier.h \
src/libsystemd-network/dhcp-identifier.c
-test_icmp6_rs_LDADD = \
+test_ndisc_rs_LDADD = \
libsystemd-network.la \
libudev.la \
libshared.la
test-dhcp-client \
test-dhcp-server \
test-ipv4ll \
- test-icmp6-rs \
+ test-ndisc-rs \
test-dhcp6-client \
test-lldp
manual_tests += \
test-pppoe
-# ------------------------------------------------------------------------------
-if ENABLE_TERMINAL
-noinst_LTLIBRARIES += \
- libsystemd-terminal.la
-
-rootlibexec_PROGRAMS += \
- systemd-consoled
-
-noinst_PROGRAMS += \
- systemd-evcat \
- systemd-modeset \
- systemd-subterm
-
-pkgdata_DATA = \
- src/libsystemd-terminal/unifont-glyph-array.bin
-
-nodist_userunit_DATA += \
- units/user/systemd-consoled.service
-
-USER_DEFAULT_TARGET_WANTS += \
- systemd-consoled.service
-
-tests += \
- test-term-page \
- test-term-parser \
- test-unifont
-endif
-
-EXTRA_DIST += \
- units/user/systemd-consoled.service.in
-
-libsystemd_terminal_la_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.h \
- src/libsystemd-terminal/unifont-def.h \
- src/libsystemd-terminal/unifont.c
-
-libsystemd_terminal_la_LIBADD = \
- libshared.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 \
- libshared.la \
- $(TERMINAL_LIBS)
-
-systemd_evcat_CFLAGS = \
- $(AM_CFLAGS) \
- $(TERMINAL_CFLAGS)
-
-systemd_evcat_SOURCES = \
- src/libsystemd-terminal/evcat.c
-
-systemd_evcat_LDADD = \
- libsystemd-terminal.la \
- libshared.la \
- $(TERMINAL_LIBS)
-
-systemd_modeset_CFLAGS = \
- $(AM_CFLAGS) \
- $(TERMINAL_CFLAGS)
-
-systemd_modeset_SOURCES = \
- src/libsystemd-terminal/modeset.c
-
-systemd_modeset_LDADD = \
- libsystemd-terminal.la \
- libshared.la \
- $(TERMINAL_LIBS)
-
-systemd_subterm_SOURCES = \
- src/libsystemd-terminal/subterm.c
-
-systemd_subterm_LDADD = \
- libsystemd-terminal.la \
- libshared.la
-
-test_term_page_SOURCES = \
- src/libsystemd-terminal/test-term-page.c
-
-test_term_page_LDADD = \
- libsystemd-terminal.la \
- libshared.la
-
-test_term_parser_SOURCES = \
- src/libsystemd-terminal/test-term-parser.c
-
-test_term_parser_LDADD = \
- libsystemd-terminal.la \
- libshared.la
-
-test_unifont_SOURCES = \
- src/libsystemd-terminal/test-unifont.c
-
-test_unifont_LDADD = \
- libsystemd-terminal.la \
- libshared.la
-
-src/libsystemd-terminal/unifont-glyph-array.bin: tools/compile-unifont.py $(UNIFONT)
- $(AM_V_GEN)$(PYTHON) $< <$(UNIFONT) >$@
-
-EXTRA_DIST += \
- tools/compile-unifont.py
-
# ------------------------------------------------------------------------------
include_HEADERS += \
src/libudev/libudev.h
src/udev/keyboard-keys-list.txt:
$(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9]/ { if ($$2 != "KEY_MAX") { print $$2 } }' | sed 's/^KEY_COFFEE$$/KEY_SCREENLOCK/' > $@
+ $(AM_V_GEN)$(CPP) $(CFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS) -dM -include linux/input.h - < /dev/null | $(AWK) '/^#define[ \t]+KEY_[^ ]+[ \t]+[0-9K]/ { if ($$2 != "KEY_MAX") { print $$2 } }' > $@
src/udev/keyboard-keys-from-name.gperf: src/udev/keyboard-keys-list.txt
$(AM_V_GEN)$(AWK) 'BEGIN{ print "struct key { const char* name; unsigned short id; };"; print "%null-strings"; print "%%";} { print tolower(substr($$1 ,5)) ", " $$1 }' < $< > $@
src/udev/keyboard-keys-from-name.h: src/udev/keyboard-keys-from-name.gperf
$(AM_V_GPERF)$(GPERF) -L ANSI-C -t -N keyboard_lookup_key -H hash_key_name -p -C < $< > $@
-src/udev/keyboard-keys-to-name.h: src/udev/keyboard-keys-list.txt
- $(AM_V_GEN)$(AWK) 'BEGIN{ print "const char* const key_names[KEY_CNT] = { "} { print "[" $$1 "] = \"" $$1 "\"," } END{print "};"}' < $< > $@
-
gperf_txt_sources += \
src/udev/keyboard-keys-list.txt
nodist_libudev_core_la_SOURCES = \
src/udev/keyboard-keys-from-name.h \
- src/udev/keyboard-keys-to-name.h \
src/udev/net/link-config-gperf.c
-gperf_gperf_sources = \
+gperf_gperf_sources += \
src/udev/net/link-config-gperf.gperf
libudev_core_la_CFLAGS = \
if HAVE_GNUTLS
systemd_journal_remote_LDADD += \
$(GNUTLS_LIBS)
+endif
# systemd-journal-remote make sense mostly with full crypto stack
dist_systemunit_DATA += \
-chmod 755 $(DESTDIR)/var/log/journal/remote
INSTALL_EXEC_HOOKS += journal-remote-install-hook
-endif
nodist_pkgsysconf_DATA += \
src/journal-remote/journal-remote.conf
test_coredump_vacuum_LDADD = \
libshared.la
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/coredumpctl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_coredumpctl
+endif
nodist_sysctl_DATA = \
sysctl.d/50-coredump.conf
systemd-rfkill
nodist_systemunit_DATA += \
- units/systemd-rfkill@.service
+ units/systemd-rfkill.service
+
+dist_systemunit_DATA += \
+ units/systemd-rfkill.socket
systemd_rfkill_SOURCES = \
src/rfkill/rfkill.c
endif
EXTRA_DIST += \
- units/systemd-rfkill@.service.in
+ units/systemd-rfkill.service.in
# ------------------------------------------------------------------------------
if HAVE_LIBCRYPTSETUP
bin_PROGRAMS += \
hostnamectl
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/hostnamectl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_hostnamectl
-
+endif
endif
polkitpolicy_in_files += \
bin_PROGRAMS += \
localectl
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/localectl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_localectl
-
+endif
endif
.PHONY: update-kbd-model-map
bin_PROGRAMS += \
timedatectl
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/timedatectl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_timedatectl
endif
+endif
polkitpolicy_in_files += \
src/timedate/org.freedesktop.timedate1.policy.in
rootbin_PROGRAMS += \
machinectl
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/machinectl
+endif
test_machine_tables_SOURCES = \
src/machine/test-machine-tables.c
polkitpolicy_files += \
src/machine/org.freedesktop.machine1.policy
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_machinectl \
shell-completion/zsh/_sd_machines
+endif
SYSTEM_UNIT_ALIASES += \
systemd-machined.service dbus-org.freedesktop.machine1.service
src/resolve/resolved-bus.h \
src/resolve/resolved-link.h \
src/resolve/resolved-link.c \
+ src/resolve/resolved-llmnr.h \
+ src/resolve/resolved-llmnr.c \
src/resolve/resolved-def.h \
src/resolve/resolved-dns-rr.h \
src/resolve/resolved-dns-rr.c \
-Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
libnss_resolve_la_LIBADD = \
- libshared.la
+ libshared.la \
+ -ldl
lib_LTLIBRARIES += \
libnss_resolve.la
src/libsystemd-network/network-internal.h \
src/network/networkd.h \
src/network/networkd-link.h \
+ src/network/networkd-link.c \
src/network/networkd-netdev.h \
- src/network/networkd-netdev-tunnel.h \
- src/network/networkd-netdev-veth.h \
- src/network/networkd-netdev-vxlan.h \
- src/network/networkd-netdev-vlan.h \
- src/network/networkd-netdev-macvlan.h \
- src/network/networkd-netdev-ipvlan.h \
- src/network/networkd-netdev-dummy.h \
- src/network/networkd-netdev-tuntap.h \
- src/network/networkd-netdev-bond.h \
- src/network/networkd-netdev-bridge.h \
src/network/networkd-netdev.c \
+ src/network/networkd-netdev-tunnel.h \
src/network/networkd-netdev-tunnel.c \
+ src/network/networkd-netdev-veth.h \
src/network/networkd-netdev-veth.c \
+ src/network/networkd-netdev-vxlan.h \
src/network/networkd-netdev-vxlan.c \
+ src/network/networkd-netdev-vlan.h \
src/network/networkd-netdev-vlan.c \
+ src/network/networkd-netdev-macvlan.h \
src/network/networkd-netdev-macvlan.c \
+ src/network/networkd-netdev-ipvlan.h \
src/network/networkd-netdev-ipvlan.c \
+ src/network/networkd-netdev-dummy.h \
src/network/networkd-netdev-dummy.c \
+ src/network/networkd-netdev-tuntap.h \
src/network/networkd-netdev-tuntap.c \
+ src/network/networkd-netdev-bond.h \
src/network/networkd-netdev-bond.c \
+ src/network/networkd-netdev-bridge.h \
src/network/networkd-netdev-bridge.c \
- src/network/networkd-link.c \
src/network/networkd-link-bus.c \
src/network/networkd-ipv4ll.c \
src/network/networkd-dhcp4.c \
src/network/networkd-dhcp6.c \
+ src/network/networkd-ndisc.c \
+ src/network/networkd-network.h \
src/network/networkd-network.c \
src/network/networkd-network-bus.c \
+ src/network/networkd-address.h \
src/network/networkd-address.c \
+ src/network/networkd-route.h \
src/network/networkd-route.c \
src/network/networkd-manager.c \
src/network/networkd-manager-bus.c \
+ src/network/networkd-fdb.h \
src/network/networkd-fdb.c \
- src/network/networkd-address-pool.c
+ src/network/networkd-address-pool.h \
+ src/network/networkd-address-pool.c \
+ src/network/networkd-util.h \
+ src/network/networkd-util.c
nodist_libnetworkd_core_la_SOURCES = \
src/network/networkd-network-gperf.c \
rootbin_PROGRAMS += \
loginctl
+if ENABLE_BASH_COMPLETION
dist_bashcompletion_DATA += \
shell-completion/bash/loginctl
+endif
+if ENABLE_ZSH_COMPLETION
dist_zshcompletion_DATA += \
shell-completion/zsh/_loginctl \
shell-completion/zsh/_systemd-inhibit
+endif
systemd_inhibit_SOURCES = \
src/login/inhibit.c
dist_pamconf_DATA = \
src/login/systemd-user
+EXTRA_DIST += \
+ src/login/systemd-user.m4
endif
nodist_systemunit_DATA += \
test/loopy.service.d \
test/loopy.service.d/compat.conf
-# ------------------------------------------------------------------------------
-if HAVE_PYTHON_DEVEL
-pkgpyexec_LTLIBRARIES = \
- _journal.la \
- id128.la \
- _daemon.la \
- _reader.la \
- login.la
-
-_journal_la_SOURCES = \
- src/python-systemd/_journal.c
-
-_journal_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS)
-
-_journal_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-_journal_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libsystemd.la
-
-id128_la_SOURCES = \
- src/python-systemd/id128.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-nodist_id128_la_SOURCES = \
- src/python-systemd/id128-constants.h
-
-id128_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS) \
- -I$(top_builddir)/src/python-systemd
-
-id128_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-id128_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-_daemon_la_SOURCES = \
- src/python-systemd/_daemon.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-_daemon_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS) \
- -I$(top_builddir)/src/python-systemd
-
-_daemon_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-_daemon_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-_reader_la_SOURCES = \
- src/python-systemd/_reader.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-_reader_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS)
-
-_reader_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-_reader_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-login_la_SOURCES = \
- src/python-systemd/login.c \
- src/python-systemd/pyutil.c \
- src/python-systemd/pyutil.h
-
-login_la_CFLAGS = \
- $(AM_CFLAGS) \
- -fvisibility=default \
- $(PYTHON_DEVEL_CFLAGS)
-
-login_la_LDFLAGS = \
- $(AM_LDFLAGS) \
- -shared \
- -module \
- -avoid-version
-
-login_la_LIBADD = \
- $(PYTHON_DEVEL_LIBS) \
- libshared.la \
- libsystemd.la
-
-dist_pkgpyexec_PYTHON = \
- src/python-systemd/journal.py \
- src/python-systemd/daemon.py \
- src/python-systemd/__init__.py
-
-src/python-systemd/id128-constants.h: src/systemd/sd-messages.h
- $(AM_V_at)$(MKDIR_P) $(dir $@)
- $(AM_V_GEN)$(SED) -n -r 's/,//g; s/#define (SD_MESSAGE_[A-Z0-9_]+)\s.*/add_id(m, "\1", \1) JOINER/p' <$< >$@
-
-BUILT_SOURCES += \
- $(nodist_id128_la_SOURCES)
-
-SPHINXOPTS = -D version=$(VERSION) -D release=$(VERSION)
-sphinx-%:
- $(AM_V_at)test -n "$(SPHINX_BUILD)" || { echo " *** sphinx-build is not available"; exit 1; }
- $(AM_V_GEN)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(SPHINX_BUILD) -b $* $(SPHINXOPTS) $(top_srcdir)/src/python-systemd/docs $(top_builddir)/docs/html/python-systemd/
- $(AM_V_at)echo Output has been generated in $(abs_top_builddir)/docs/html/python-systemd/
-
-python-shell:
- $(AM_V_at)echo "Starting python with $(DESTDIR)$(pyexecdir)"
- $(AM_V_at)PYTHONPATH=$(DESTDIR)$(pyexecdir) LD_LIBRARY_PATH=$(DESTDIR)$(libdir) $(PYTHON)
-
-destdir-sphinx: all
- dir="$$(mktemp -d /tmp/systemd-install.XXXXXX)" && \
- $(MAKE) DESTDIR="$$dir" install && \
- $(MAKE) DESTDIR="$$dir" sphinx-html && \
- rm -rf "$$dir"
-
-endif
-
-CLEAN_LOCAL_HOOKS += clean-sphinx
-
-.PHONY: python-shell destdir-sphinx clean-sphinx clean-python
-
-clean-sphinx:
- -rm -rf docs/html/python-systemd/
-
-# Remove Python stuff, e.g. to force rebuilding for a different Python version.
-clean-python:
- -rm -rf src/python-systemd/.libs src/python-systemd/*.l[ao]
- -rm -f _daemon.la id128.la _journal.la login.la _reader.la
-
# ------------------------------------------------------------------------------
if ENABLE_COMPAT_LIBS
libsystemd-%.c: src/compat-libs/libsystemd-%.sym
'|RC_LOCAL_SCRIPT_PATH_START=$(RC_LOCAL_SCRIPT_PATH_START)|' \
'|RC_LOCAL_SCRIPT_PATH_STOP=$(RC_LOCAL_SCRIPT_PATH_STOP)|' \
'|PYTHON=$(PYTHON)|' \
- '|PYTHON_BINARY=$(PYTHON_BINARY)|' \
'|NTP_SERVERS=$(NTP_SERVERS)|' \
'|DNS_SERVERS=$(DNS_SERVERS)|' \
'|systemuidmax=$(SYSTEM_UID_MAX)|' \
--with-sysvrcnd-path=
endif
-if HAVE_PYTHON
-DISTCHECK_CONFIGURE_FLAGS += \
- --with-python
-endif
-
if ENABLE_SPLIT_USR
DISTCHECK_CONFIGURE_FLAGS += \
--enable-split-usr
.PHONY: hwdb-update
hwdb-update:
( cd $(top_srcdir)/hwdb && \
- wget -N http://www.linux-usb.org/usb.ids \
- http://pci-ids.ucw.cz/v2.2/pci.ids \
- http://standards.ieee.org/develop/regauth/oui/oui.txt \
- http://standards.ieee.org/develop/regauth/iab/iab.txt && \
+ wget -O usb.ids 'http://www.linux-usb.org/usb.ids' && \
+ wget -O pci.ids 'http://pci-ids.ucw.cz/v2.2/pci.ids' && \
+ wget -O ma-large.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-L&format=txt' && \
+ wget -O ma-medium.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-M&format=txt' && \
+ wget -O ma-small.txt 'https://services13.ieee.org/RST/standards-ra-web/rest/assignments/download/?registry=MA-S&format=txt' && \
./ids-update.pl )
+.PHONY: built-sources
+built-sources: $(BUILT_SOURCES)
+
.PHONY: git-tag
git-tag:
git tag -s "v$(VERSION)" -m "systemd $(VERSION)"
.PHONY: git-tar
git-tar:
- git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | xz > systemd-$(VERSION).tar.xz
+ git archive --format=tar --prefix=systemd-$(VERSION)/ HEAD | gzip > systemd-$(VERSION).tar.gz
www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
.PHONY: doc-sync
-doc-sync: all destdir-sphinx
+doc-sync: all
rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
- rsync -rlv --delete --omit-dir-times docs/html/python-systemd/ $(www_target)/python-systemd/
.PHONY: gardel
-gardel: upload
+gardel:
scp man/*.html gardel:public/systemd-man/
.PHONY: lennart-fedora
projects / thirdparty / systemd.git / blobdiff