]> git.ipfire.org Git - thirdparty/systemd.git/blobdiff - Makefile.am
resolved: turn on DNSSEC by default, unless configured otherwise
[thirdparty/systemd.git] / Makefile.am
index 4218a6dcdf72076033c623dcf7e74c350d55457f..8c151f538fceb0353a9d4a035499b84d16d9c5f5 100644 (file)
@@ -42,27 +42,9 @@ LIBUDEV_CURRENT=7
 LIBUDEV_REVISION=4
 LIBUDEV_AGE=6
 
-LIBSYSTEMD_CURRENT=13
+LIBSYSTEMD_CURRENT=14
 LIBSYSTEMD_REVISION=0
-LIBSYSTEMD_AGE=13
-
-# The following four libraries only exist for compatibility reasons,
-# their version info should not be bumped anymore
-LIBSYSTEMD_LOGIN_CURRENT=9
-LIBSYSTEMD_LOGIN_REVISION=3
-LIBSYSTEMD_LOGIN_AGE=9
-
-LIBSYSTEMD_DAEMON_CURRENT=0
-LIBSYSTEMD_DAEMON_REVISION=12
-LIBSYSTEMD_DAEMON_AGE=0
-
-LIBSYSTEMD_ID128_CURRENT=0
-LIBSYSTEMD_ID128_REVISION=28
-LIBSYSTEMD_ID128_AGE=0
-
-LIBSYSTEMD_JOURNAL_CURRENT=11
-LIBSYSTEMD_JOURNAL_REVISION=5
-LIBSYSTEMD_JOURNAL_AGE=11
+LIBSYSTEMD_AGE=14
 
 # Dirs of external packages
 dbuspolicydir=@dbuspolicydir@
@@ -155,6 +137,14 @@ else
 noinst_PROGRAMS =
 TESTS =
 endif
+if ENABLE_BASH_COMPLETION
+dist_bashcompletion_DATA = $(dist_bashcompletion_data)
+nodist_bashcompletion_DATA = $(nodist_bashcompletion_data)
+endif
+if ENABLE_ZSH_COMPLETION
+dist_zshcompletion_DATA = $(dist_zshcompletion_data)
+nodist_zshcompletion_DATA = $(nodist_zshcompletion_data)
+endif
 udevlibexec_PROGRAMS =
 gperf_gperf_sources =
 
@@ -165,6 +155,8 @@ m4_files = $(filter %.m4,$(EXTRA_DIST) $(in_files:.m4.in=.m4))
 CLEANFILES = $(BUILT_SOURCES) \
        $(pkgconfigdata_DATA) \
        $(pkgconfiglib_DATA) \
+       $(nodist_bashcompletion_data) \
+       $(nodist_zshcompletion_data) \
        $(in_files:.in=) $(in_in_files:.in.in=) \
        $(m4_files:.m4=)
 
@@ -401,7 +393,6 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-sysctl \
        systemd-sleep \
-       systemd-bus-proxyd \
        systemd-socket-proxyd \
        systemd-update-done
 
@@ -416,8 +407,7 @@ systemgenerator_PROGRAMS = \
        systemd-system-update-generator \
        systemd-debug-generator
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA = \
+dist_bashcompletion_data = \
        shell-completion/bash/busctl \
        shell-completion/bash/journalctl \
        shell-completion/bash/systemd-analyze \
@@ -432,12 +422,10 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/udevadm \
        shell-completion/bash/kernel-install
 
-nodist_bashcompletion_DATA = \
+nodist_bashcompletion_data = \
        shell-completion/bash/systemctl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA = \
+dist_zshcompletion_data = \
        shell-completion/zsh/_busctl \
        shell-completion/zsh/_journalctl \
        shell-completion/zsh/_udevadm \
@@ -451,18 +439,13 @@ dist_zshcompletion_DATA = \
        shell-completion/zsh/_systemd-delta \
        shell-completion/zsh/_systemd
 
-nodist_zshcompletion_DATA = \
+nodist_zshcompletion_data = \
        shell-completion/zsh/_systemctl
-endif
 
 EXTRA_DIST += \
        shell-completion/bash/systemctl.in \
        shell-completion/zsh/_systemctl.in
 
-CLEANFILES += \
-       $(nodist_bashcompletion_DATA) \
-       $(nodist_zshcompletion_DATA)
-
 dist_sysctl_DATA = \
        sysctl.d/50-default.conf
 
@@ -840,6 +823,7 @@ libbasic_la_SOURCES = \
        src/basic/siphash24.h \
        src/basic/set.h \
        src/basic/ordered-set.h \
+       src/basic/ordered-set.c \
        src/basic/bitmap.c \
        src/basic/bitmap.h \
        src/basic/fdset.c \
@@ -910,8 +894,6 @@ libbasic_la_SOURCES = \
        src/basic/audit-util.h \
        src/basic/xml.c \
        src/basic/xml.h \
-       src/basic/json.c \
-       src/basic/json.h \
        src/basic/barrier.c \
        src/basic/barrier.h \
        src/basic/async.c \
@@ -1133,8 +1115,6 @@ libcore_la_SOURCES = \
        src/core/socket.h \
        src/core/busname.c \
        src/core/busname.h \
-       src/core/bus-endpoint.c \
-       src/core/bus-endpoint.h \
        src/core/bus-policy.c \
        src/core/bus-policy.h \
        src/core/target.c \
@@ -1417,7 +1397,8 @@ manual_tests += \
        test-ipcrm \
        test-btrfs \
        test-acd \
-       test-ipv4ll-manual
+       test-ipv4ll-manual \
+       test-ask-password-api
 
 if HAVE_LIBIPTC
 manual_tests += \
@@ -1475,7 +1456,6 @@ tests += \
        test-tables \
        test-device-nodes \
        test-xml \
-       test-json \
        test-architecture \
        test-socket-util \
        test-fdset \
@@ -1486,7 +1466,6 @@ tests += \
        test-ratelimit \
        test-condition \
        test-uid-range \
-       test-bus-policy \
        test-locale-util \
        test-execute \
        test-copy \
@@ -1497,8 +1476,11 @@ tests += \
        test-af-list \
        test-arphrd-list \
        test-dns-domain \
+       test-dns-packet \
+       test-resolve-tables \
        test-install-root \
-       test-rlimit-util
+       test-rlimit-util \
+       test-signal-util
 
 if HAVE_ACL
 tests += \
@@ -1660,6 +1642,7 @@ test_dns_domain_LDADD = \
        libsystemd-network.la \
        libshared.la
 
+
 if ENABLE_EFI
 manual_tests += \
        test-boot-timestamp
@@ -1873,6 +1856,18 @@ test_rlimit_util_SOURCES = \
 test_rlimit_util_LDADD = \
        libshared.la
 
+test_ask_password_api_SOURCES = \
+       src/test/test-ask-password-api.c
+
+test_ask_password_api_LDADD = \
+       libshared.la
+
+test_signal_util_SOURCES = \
+       src/test/test-signal-util.c
+
+test_signal_util_LDADD = \
+       libshared.la
+
 BUILT_SOURCES += \
        src/test/test-hashmap-ordered.c
 
@@ -1913,12 +1908,6 @@ test_xml_SOURCES = \
 test_xml_LDADD = \
        libshared.la
 
-test_json_SOURCES = \
-       src/test/test-json.c
-
-test_json_LDADD = \
-       libshared.la
-
 test_list_SOURCES = \
        src/test/test-list.c
 
@@ -1934,14 +1923,11 @@ test_unaligned_SOURCES = \
 test_tables_SOURCES = \
        src/test/test-tables.c \
        src/shared/test-tables.h \
-       src/bus-proxyd/bus-xml-policy.c \
-       src/bus-proxyd/bus-xml-policy.h \
        src/journal/journald-server.c \
        src/journal/journald-server.h
 
 test_tables_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -I$(top_srcdir)/src/bus-proxyd
+       $(AM_CPPFLAGS)
 
 test_tables_CFLAGS = \
        $(AM_CFLAGS) \
@@ -2182,13 +2168,6 @@ test_conf_parser_SOURCES = \
 test_conf_parser_LDADD = \
        libshared.la
 
-test_bus_policy_SOURCES = \
-       src/bus-proxyd/test-bus-xml-policy.c
-
-test_bus_policy_LDADD = \
-       libbus-proxy-core.la \
-       libshared.la
-
 test_af_list_SOURCES = \
        src/test/test-af-list.c
 
@@ -2369,10 +2348,8 @@ SYSINIT_TARGET_WANTS += \
        systemd-tmpfiles-setup-dev.service \
        systemd-tmpfiles-setup.service
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_systemd-tmpfiles
-endif
 
 TIMERS_TARGET_WANTS += \
        systemd-tmpfiles-clean.timer
@@ -2600,16 +2577,12 @@ bootctl_LDADD = \
 bin_PROGRAMS += \
        bootctl
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/bootctl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_bootctl
 endif
-endif
 
 # ------------------------------------------------------------------------------
 if HAVE_GNUEFI
@@ -2678,6 +2651,7 @@ systemd_boot_headers = \
        src/boot/efi/console.h \
        src/boot/efi/graphics.h \
        src/boot/efi/pefile.h \
+       src/boot/efi/measure.h \
        src/boot/efi/disk.h
 
 systemd_boot_sources = \
@@ -2686,18 +2660,18 @@ systemd_boot_sources = \
        src/boot/efi/graphics.c \
        src/boot/efi/pefile.c \
        src/boot/efi/disk.c \
+       src/boot/efi/measure.c \
        src/boot/efi/boot.c
 
 EXTRA_DIST += $(systemd_boot_sources) $(systemd_boot_headers)
 
-if ENABLE_EFI
-if HAVE_GNUEFI
 systemd_boot_objects = $(addprefix $(top_builddir)/,$(systemd_boot_sources:.c=.o))
 systemd_boot_solib = $(top_builddir)/src/boot/efi/systemd_boot.so
 systemd_boot = systemd-boot$(EFI_MACHINE_TYPE_NAME).efi
 
+if ENABLE_EFI
+if HAVE_GNUEFI
 bootlib_DATA = $(systemd_boot)
-CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
 
 $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(systemd_boot_headers))
        @$(MKDIR_P) $(top_builddir)/src/boot/efi/
@@ -2714,6 +2688,8 @@ $(systemd_boot): $(systemd_boot_solib)
 endif
 endif
 
+CLEANFILES += $(systemd_boot_objects) $(systemd_boot_solib) $(systemd_boot)
+
 # ------------------------------------------------------------------------------
 stub_headers = \
        src/boot/efi/util.h \
@@ -2721,6 +2697,7 @@ stub_headers = \
        src/boot/efi/disk.h \
        src/boot/efi/graphics.h \
        src/boot/efi/splash.h \
+       src/boot/efi/measure.h \
        src/boot/efi/linux.h
 
 stub_sources = \
@@ -2730,6 +2707,7 @@ stub_sources = \
        src/boot/efi/graphics.c \
        src/boot/efi/splash.c \
        src/boot/efi/linux.c \
+       src/boot/efi/measure.c \
        src/boot/efi/stub.c
 
 EXTRA_DIST += \
@@ -2737,14 +2715,13 @@ EXTRA_DIST += \
        $(stub_headers) \
        test/splash.bmp
 
-if ENABLE_EFI
-if HAVE_GNUEFI
 stub_objects = $(addprefix $(top_builddir)/,$(stub_sources:.c=.o))
 stub_solib = $(top_builddir)/src/boot/efi/stub.so
 stub = linux$(EFI_MACHINE_TYPE_NAME).efi.stub
 
+if ENABLE_EFI
+if HAVE_GNUEFI
 bootlib_DATA += $(stub)
-CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
 
 $(top_builddir)/src/boot/efi/%.o: $(top_srcdir)/src/boot/efi/%.c $(addprefix $(top_srcdir)/,$(stub_headers))
        @$(MKDIR_P) $(top_builddir)/src/boot/efi/
@@ -2758,6 +2735,11 @@ $(stub_solib): $(stub_objects)
 $(stub): $(stub_solib)
        $(AM_V_GEN)$(OBJCOPY) -j .text -j .sdata -j .data -j .dynamic \
          -j .dynsym -j .rel -j .rela -j .reloc $(EFI_FORMAT) $< $@
+endif
+endif
+
+CLEANFILES += $(stub_objects) $(stub_solib) $(stub)
+
 
 # ------------------------------------------------------------------------------
 CLEANFILES += test-efi-disk.img
@@ -2767,8 +2749,6 @@ test-efi-disk.img: $(systemd_boot) $(stub) test/test-efi-create-disk.sh
 
 test-efi: test-efi-disk.img
        $(QEMU) -machine accel=kvm -m 1024 -bios $(QEMU_BIOS) -snapshot test-efi-disk.img
-endif
-endif
 
 EXTRA_DIST += test/test-efi-create-disk.sh
 
@@ -2917,6 +2897,8 @@ systemd_nspawn_SOURCES = \
        src/nspawn/nspawn-register.h \
        src/nspawn/nspawn-setuid.c \
        src/nspawn/nspawn-setuid.h \
+       src/nspawn/nspawn-stub-pid1.c \
+       src/nspawn/nspawn-stub-pid1.h \
        src/core/mount-setup.c \
        src/core/mount-setup.h \
        src/core/loopback-setup.c \
@@ -2950,59 +2932,12 @@ systemd_run_LDADD = \
        libshared.la
 
 # ------------------------------------------------------------------------------
-noinst_LTLIBRARIES += \
-       libbus-proxy-core.la
-
-libbus_proxy_core_la_SOURCES = \
-       src/bus-proxyd/bus-xml-policy.c \
-       src/bus-proxyd/bus-xml-policy.h \
-       src/bus-proxyd/driver.c \
-       src/bus-proxyd/driver.h \
-       src/bus-proxyd/proxy.c \
-       src/bus-proxyd/proxy.h \
-       src/bus-proxyd/synthesize.c \
-       src/bus-proxyd/synthesize.h
-
-libbus_proxy_core_la_LIBADD = \
-       libshared.la
-
-systemd_bus_proxyd_SOURCES = \
-       src/bus-proxyd/bus-proxyd.c
-
-systemd_bus_proxyd_LDADD = \
-       libbus-proxy-core.la \
-       libshared.la
-
 systemd_stdio_bridge_SOURCES = \
-       src/bus-proxyd/stdio-bridge.c
+       src/stdio-bridge/stdio-bridge.c
 
 systemd_stdio_bridge_LDADD = \
-       libbus-proxy-core.la \
        libshared.la
 
-nodist_systemunit_DATA += \
-       units/systemd-bus-proxyd.service
-
-dist_systemunit_DATA += \
-       units/systemd-bus-proxyd.socket
-
-nodist_userunit_DATA += \
-       units/user/systemd-bus-proxyd.service
-
-dist_userunit_DATA += \
-       units/user/systemd-bus-proxyd.socket
-
-EXTRA_DIST += \
-       units/systemd-bus-proxyd.service.m4.in \
-       units/user/systemd-bus-proxyd.service.in
-
-if HAVE_SMACK
-bus-proxyd-set-cap-hook:
-       -$(SETCAP) cap_mac_admin+ei $(DESTDIR)$(rootlibexecdir)/systemd-bus-proxyd
-
-INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
-endif
-
 # ------------------------------------------------------------------------------
 systemd_tty_ask_password_agent_SOURCES = \
        src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -3165,7 +3100,6 @@ tests += \
        test-bus-cleanup \
        test-bus-server \
        test-bus-match \
-       test-bus-proxy \
        test-bus-kernel \
        test-bus-kernel-bloom \
        test-bus-zero-copy \
@@ -3258,12 +3192,6 @@ test_bus_match_SOURCES = \
 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
 
@@ -3881,13 +3809,13 @@ tests += \
 
 # ------------------------------------------------------------------------------
 
-rootlibexec_PROGRAMS += \
-       systemd-activate
+bin_PROGRAMS += \
+       systemd-socket-activate
 
-systemd_activate_SOURCES = \
+systemd_socket_activate_SOURCES = \
        src/activate/activate.c
 
-systemd_activate_LDADD = \
+systemd_socket_activate_LDADD = \
        libshared.la
 
 # ------------------------------------------------------------------------------
@@ -4000,7 +3928,8 @@ journalctl_SOURCES = \
        src/journal/journalctl.c
 
 journalctl_LDADD = \
-       libshared.la
+       libshared.la \
+       libudev-core.la
 
 if HAVE_QRENCODE
 journalctl_SOURCES += \
@@ -4248,7 +4177,9 @@ libsystemd_journal_internal_la_SOURCES += \
        src/journal/journal-authenticate.c \
        src/journal/journal-authenticate.h \
        src/journal/fsprg.c \
-       src/journal/fsprg.h
+       src/journal/fsprg.h \
+       src/shared/gcrypt-util.c \
+       src/shared/gcrypt-util.h
 
 libsystemd_journal_internal_la_LIBADD += \
        $(GCRYPT_LIBS)
@@ -4368,30 +4299,39 @@ systemd_socket_proxyd_LDADD = \
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
-       src/journal/coredump.c \
-       src/journal/coredump-vacuum.c \
-       src/journal/coredump-vacuum.h
+       src/coredump/coredump.c \
+       src/coredump/coredump-vacuum.c \
+       src/coredump/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
        libshared.la
 
 if HAVE_ELFUTILS
 systemd_coredump_SOURCES += \
-       src/journal/stacktrace.c \
-       src/journal/stacktrace.h
+       src/coredump/stacktrace.c \
+       src/coredump/stacktrace.h
 
 systemd_coredump_LDADD += \
        $(ELFUTILS_LIBS)
 endif
 
+nodist_systemunit_DATA += \
+       units/systemd-coredump@.service
+
+dist_systemunit_DATA += \
+       units/systemd-coredump.socket
+
+SOCKETS_TARGET_WANTS += \
+       systemd-coredump.socket
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
 dist_pkgsysconf_DATA += \
-       src/journal/coredump.conf
+       src/coredump/coredump.conf
 
 coredumpctl_SOURCES = \
-       src/journal/coredumpctl.c
+       src/coredump/coredumpctl.c
 
 coredumpctl_LDADD = \
        libshared.la
@@ -4403,22 +4343,18 @@ manual_tests += \
        test-coredump-vacuum
 
 test_coredump_vacuum_SOURCES = \
-       src/journal/test-coredump-vacuum.c  \
-       src/journal/coredump-vacuum.c \
-       src/journal/coredump-vacuum.h
+       src/coredump/test-coredump-vacuum.c  \
+       src/coredump/coredump-vacuum.c \
+       src/coredump/coredump-vacuum.h
 
 test_coredump_vacuum_LDADD = \
        libshared.la
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/coredumpctl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_coredumpctl
-endif
 
 nodist_sysctl_DATA = \
        sysctl.d/50-coredump.conf
@@ -4428,7 +4364,8 @@ CLEANFILES += \
 endif
 
 EXTRA_DIST += \
-       sysctl.d/50-coredump.conf.in
+       sysctl.d/50-coredump.conf.in \
+       units/systemd-coredump@.service.in
 
 # ------------------------------------------------------------------------------
 if ENABLE_BINFMT
@@ -4669,16 +4606,12 @@ hostnamectl_LDADD = \
 bin_PROGRAMS += \
        hostnamectl
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/hostnamectl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_hostnamectl
 endif
-endif
 
 polkitpolicy_in_files += \
        src/hostname/org.freedesktop.hostname1.policy.in
@@ -4743,16 +4676,12 @@ localectl_LDADD = \
 bin_PROGRAMS += \
        localectl
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/localectl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_localectl
 endif
-endif
 
 .PHONY: update-kbd-model-map
 
@@ -4803,16 +4732,12 @@ timedatectl_LDADD = \
 bin_PROGRAMS += \
        timedatectl
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/timedatectl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_timedatectl
 endif
-endif
 
 polkitpolicy_in_files += \
        src/timedate/org.freedesktop.timedate1.policy.in
@@ -4847,7 +4772,6 @@ nodist_systemunit_DATA += \
 GENERAL_ALIASES += \
        $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
 
-
 nodist_pkgsysconf_DATA += \
        src/timesync/timesyncd.conf
 
@@ -4918,11 +4842,6 @@ machinectl_LDADD = \
 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
 
@@ -4950,11 +4869,12 @@ dist_dbuspolicy_DATA += \
 polkitpolicy_files += \
        src/machine/org.freedesktop.machine1.policy
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_bashcompletion_data += \
+       shell-completion/bash/machinectl
+
+dist_zshcompletion_data += \
        shell-completion/zsh/_machinectl \
        shell-completion/zsh/_sd_machines
-endif
 
 SYSTEM_UNIT_ALIASES += \
        systemd-machined.service dbus-org.freedesktop.machine1.service
@@ -5032,8 +4952,6 @@ systemd_pull_SOURCES = \
        src/import/import-compress.h \
        src/import/curl-util.c \
        src/import/curl-util.h \
-       src/import/aufs-util.c \
-       src/import/aufs-util.h \
        src/import/qcow2-util.c \
        src/import/qcow2-util.h
 
@@ -5157,7 +5075,20 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_RESOLVED
-if HAVE_GCRYPT
+
+basic_dns_sources = \
+       src/resolve/resolved-dns-dnssec.c \
+       src/resolve/resolved-dns-dnssec.h \
+       src/resolve/resolved-dns-packet.c \
+       src/resolve/resolved-dns-packet.h \
+       src/resolve/resolved-dns-rr.c \
+       src/resolve/resolved-dns-rr.h \
+       src/resolve/resolved-dns-answer.c \
+       src/resolve/resolved-dns-answer.h \
+       src/resolve/resolved-dns-question.c \
+       src/resolve/resolved-dns-question.h \
+       src/resolve/dns-type.c \
+       src/resolve/dns-type.h
 
 systemd_resolved_SOURCES = \
        src/resolve/resolved.c \
@@ -5178,14 +5109,7 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-mdns.h \
        src/resolve/resolved-mdns.c \
        src/resolve/resolved-def.h \
-       src/resolve/resolved-dns-rr.h \
-       src/resolve/resolved-dns-rr.c \
-       src/resolve/resolved-dns-question.h \
-       src/resolve/resolved-dns-question.c \
-       src/resolve/resolved-dns-answer.h \
-       src/resolve/resolved-dns-answer.c \
-       src/resolve/resolved-dns-packet.h \
-       src/resolve/resolved-dns-packet.c \
+       $(basic_dns_sources) \
        src/resolve/resolved-dns-query.h \
        src/resolve/resolved-dns-query.c \
        src/resolve/resolved-dns-synthesize.h \
@@ -5204,14 +5128,12 @@ systemd_resolved_SOURCES = \
        src/resolve/resolved-dns-zone.c \
        src/resolve/resolved-dns-stream.h \
        src/resolve/resolved-dns-stream.c \
-       src/resolve/resolved-dns-dnssec.h \
-       src/resolve/resolved-dns-dnssec.c \
        src/resolve/resolved-dns-trust-anchor.h \
        src/resolve/resolved-dns-trust-anchor.c \
        src/resolve/resolved-etc-hosts.h \
        src/resolve/resolved-etc-hosts.c \
-       src/resolve/dns-type.c \
-       src/resolve/dns-type.h
+       src/shared/gcrypt-util.c \
+       src/shared/gcrypt-util.h
 
 nodist_systemd_resolved_SOURCES = \
        src/resolve/dns_type-from-name.h \
@@ -5271,16 +5193,9 @@ lib_LTLIBRARIES += \
 
 systemd_resolve_SOURCES = \
        src/resolve/resolve-tool.c \
-       src/resolve/resolved-dns-packet.c \
-       src/resolve/resolved-dns-packet.h \
-       src/resolve/resolved-dns-rr.c \
-       src/resolve/resolved-dns-rr.h \
-       src/resolve/resolved-dns-answer.c \
-       src/resolve/resolved-dns-answer.h \
-       src/resolve/resolved-dns-question.c \
-       src/resolve/resolved-dns-question.h \
-       src/resolve/dns-type.c \
-       src/resolve/dns-type.h
+       $(basic_dns_sources) \
+       src/shared/gcrypt-util.c \
+       src/shared/gcrypt-util.h
 
 nodist_systemd_resolve_SOURCES = \
        src/resolve/dns_type-from-name.h \
@@ -5289,7 +5204,7 @@ nodist_systemd_resolve_SOURCES = \
 systemd_resolve_LDADD = \
        libshared.la
 
-rootlibexec_PROGRAMS += \
+bin_PROGRAMS += \
        systemd-resolve
 
 tests += \
@@ -5299,20 +5214,43 @@ tests += \
 manual_tests += \
        test-dnssec-complex
 
+test_resolve_tables_SOURCES = \
+       src/resolve/test-resolve-tables.c \
+       src/resolve/dns_type-from-name.h \
+       src/resolve/dns_type-to-name.h \
+       $(basic_dns_sources) \
+       src/shared/test-tables.h
+
+test_resolve_tables_LDADD = \
+       libshared.la
+
+test_dns_packet_SOURCES = \
+       src/resolve/test-dns-packet.c \
+       $(basic_dns_sources)
+
+test_dns_packet_CPPFLAGS = \
+       $(AM_CPPFLAGS) \
+       -DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\"
+
+test_dns_packet_LDADD = \
+       libshared.la
+
+EXTRA_DIST += \
+       src/resolve/test-data/_openpgpkey.fedoraproject.org.pkts \
+       src/resolve/test-data/fedoraproject.org.pkts \
+       src/resolve/test-data/gandi.net.pkts \
+       src/resolve/test-data/google.com.pkts \
+       src/resolve/test-data/root.pkts \
+       src/resolve/test-data/sw1a1aa-sw1a2aa-sw1a2ab-sw1a2ac.find.me.uk.pkts \
+       src/resolve/test-data/teamits.com.pkts \
+       src/resolve/test-data/zbyszek@fedoraproject.org.pkts \
+       src/resolve/test-data/_443._tcp.fedoraproject.org.pkts \
+       src/resolve/test-data/kyhwana.org.pkts \
+       src/resolve/test-data/fake-caa.pkts
+
 test_dnssec_SOURCES = \
        src/resolve/test-dnssec.c \
-       src/resolve/resolved-dns-packet.c \
-       src/resolve/resolved-dns-packet.h \
-       src/resolve/resolved-dns-rr.c \
-       src/resolve/resolved-dns-rr.h \
-       src/resolve/resolved-dns-answer.c \
-       src/resolve/resolved-dns-answer.h \
-       src/resolve/resolved-dns-question.c \
-       src/resolve/resolved-dns-question.h \
-       src/resolve/resolved-dns-dnssec.c \
-       src/resolve/resolved-dns-dnssec.h \
-       src/resolve/dns-type.c \
-       src/resolve/dns-type.h
+       $(basic_dns_sources)
 
 test_dnssec_LDADD = \
        libshared.la
@@ -5326,7 +5264,6 @@ test_dnssec_complex_LDADD = \
        libshared.la
 
 endif
-endif
 
 gperf_txt_sources += \
        src/resolve/dns_type-list.txt
@@ -5444,10 +5381,8 @@ networkctl_LDADD = \
        libshared.la \
        libsystemd-network.la
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/networkctl
-endif
 
 test_network_SOURCES = \
        src/network/test-network.c
@@ -5577,16 +5512,12 @@ loginctl_LDADD = \
 rootbin_PROGRAMS += \
        loginctl
 
-if ENABLE_BASH_COMPLETION
-dist_bashcompletion_DATA += \
+dist_bashcompletion_data += \
        shell-completion/bash/loginctl
-endif
 
-if ENABLE_ZSH_COMPLETION
-dist_zshcompletion_DATA += \
+dist_zshcompletion_data += \
        shell-completion/zsh/_loginctl \
        shell-completion/zsh/_systemd-inhibit
-endif
 
 systemd_inhibit_SOURCES = \
        src/login/inhibit.c
@@ -5757,6 +5688,14 @@ EXTRA_DIST += \
        test/TEST-05-RLIMITS/Makefile \
        test/TEST-05-RLIMITS/test-rlimits.sh \
        test/TEST-05-RLIMITS/test.sh \
+       test/TEST-06-SELINUX/Makefile \
+       test/TEST-06-SELINUX/test-selinux-checks.sh \
+       test/TEST-06-SELINUX/test.sh \
+       test/TEST-06-SELINUX/systemd_test.te \
+       test/TEST-06-SELINUX/systemd_test.if \
+       test/TEST-07-ISSUE-1981/Makefile \
+       test/TEST-07-ISSUE-1981/test-segfault.sh \
+       test/TEST-07-ISSUE-1981/test.sh \
        test/test-functions
 
 EXTRA_DIST += \
@@ -5767,127 +5706,6 @@ EXTRA_DIST += \
        test/loopy.service.d \
        test/loopy.service.d/compat.conf
 
-# ------------------------------------------------------------------------------
-if ENABLE_COMPAT_LIBS
-libsystemd-%.c: src/compat-libs/libsystemd-%.sym
-       $(AM_V_at)$(MKDIR_P) $(dir $@)
-       $(AM_V_GEN)sed -r -n 's/^ +(sd_.*);/obsolete_lib(\1,$(notdir $(basename $<)));/p' <$< >$@
-
-BUILT_SOURCES += \
-       libsystemd-journal.c \
-       libsystemd-login.c \
-       libsystemd-id128.c \
-       libsystemd-daemon.c
-
-nodist_libsystemd_journal_la_SOURCES = \
-       libsystemd-journal.c
-
-libsystemd_journal_la_SOURCES = \
-       src/compat-libs/libsystemd-journal.sym
-
-libsystemd_journal_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_journal_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_JOURNAL_CURRENT):$(LIBSYSTEMD_JOURNAL_REVISION):$(LIBSYSTEMD_JOURNAL_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-journal.sym
-
-libsystemd_journal_la_LIBADD = \
-       libsystemd-journal-internal.la \
-       libsystemd-internal.la
-
-nodist_libsystemd_login_la_SOURCES = \
-       libsystemd-login.c
-
-libsystemd_login_la_SOURCES = \
-       src/compat-libs/libsystemd-login.sym
-
-libsystemd_login_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_login_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_LOGIN_CURRENT):$(LIBSYSTEMD_LOGIN_REVISION):$(LIBSYSTEMD_LOGIN_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-login.sym
-
-libsystemd_login_la_LIBADD = \
-       libsystemd-internal.la
-
-nodist_libsystemd_id128_la_SOURCES = \
-       libsystemd-id128.c
-
-libsystemd_id128_la_SOURCES = \
-       src/compat-libs/libsystemd-id128.sym
-
-libsystemd_id128_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_id128_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_ID128_CURRENT):$(LIBSYSTEMD_ID128_REVISION):$(LIBSYSTEMD_ID128_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-id128.sym
-
-libsystemd_id128_la_LIBADD = \
-       libsystemd-internal.la
-
-nodist_libsystemd_daemon_la_SOURCES = \
-       libsystemd-daemon.c
-
-libsystemd_daemon_la_SOURCES = \
-       src/compat-libs/libsystemd-daemon.sym
-
-libsystemd_daemon_la_CPPFLAGS = \
-       $(AM_CPPFLAGS) \
-       -imacros$(top_srcdir)/src/compat-libs/linkwarning.h
-
-libsystemd_daemon_la_LDFLAGS = \
-       $(AM_LDFLAGS) \
-       -version-info $(LIBSYSTEMD_DAEMON_CURRENT):$(LIBSYSTEMD_DAEMON_REVISION):$(LIBSYSTEMD_DAEMON_AGE) \
-       -Wl,--version-script=$(top_srcdir)/src/compat-libs/libsystemd-daemon.sym
-
-libsystemd_daemon_la_LIBADD = \
-       libsystemd-internal.la
-
-lib_LTLIBRARIES += \
-       libsystemd-journal.la \
-       libsystemd-login.la \
-       libsystemd-id128.la \
-       libsystemd-daemon.la
-
-pkgconfiglib_DATA += \
-       src/compat-libs/libsystemd-journal.pc \
-       src/compat-libs/libsystemd-login.pc \
-       src/compat-libs/libsystemd-id128.pc \
-       src/compat-libs/libsystemd-daemon.pc
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-compat-lib-install-hook:
-       libname=libsystemd-login.so && $(move-to-rootlibdir)
-       libname=libsystemd-journal.so && $(move-to-rootlibdir)
-       libname=libsystemd-id128.so && $(move-to-rootlibdir)
-       libname=libsystemd-daemon.so && $(move-to-rootlibdir)
-
-compat-lib-uninstall-hook:
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-login.so*
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-journal.so*
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-id128.so*
-       rm -f $(DESTDIR)$(rootlibdir)/libsystemd-daemon.so*
-
-INSTALL_EXEC_HOOKS += compat-lib-install-hook
-UNINSTALL_EXEC_HOOKS += compat-lib-uninstall-hook
-endif
-
-EXTRA_DIST += \
-       src/compat-libs/linkwarning.h \
-       src/compat-libs/libsystemd-journal.pc.in \
-       src/compat-libs/libsystemd-login.pc.in \
-       src/compat-libs/libsystemd-id128.pc.in \
-       src/compat-libs/libsystemd-daemon.pc.in
-
 # ------------------------------------------------------------------------------
 substitutions = \
        '|rootlibexecdir=$(rootlibexecdir)|' \
@@ -5941,6 +5759,7 @@ substitutions = \
        '|PYTHON=$(PYTHON)|' \
        '|NTP_SERVERS=$(NTP_SERVERS)|' \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
+       '|DEFAULT_DNSSEC_MODE=$(DEFAULT_DNSSEC_MODE)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
        '|TTY_GID=$(TTY_GID)|' \
@@ -6043,11 +5862,12 @@ XSLTPROC_FLAGS = \
        --stringparam systemd.version $(VERSION) \
        --path '$(builddir)/man:$(srcdir)/man'
 
+XSLT = $(if $(XSLTPROC), $(XSLTPROC), xsltproc)
 XSLTPROC_PROCESS_MAN = \
-       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
+       $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-man.xsl $<
 
 XSLTPROC_PROCESS_HTML = \
-       $(AM_V_XSLT)$(XSLTPROC) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
+       $(AM_V_XSLT)$(XSLT) -o $@ $(XSLTPROC_FLAGS) $(srcdir)/man/custom-html.xsl $<
 
 man/%.1: man/%.xml man/custom-man.xsl man/custom-entities.ent
        $(XSLTPROC_PROCESS_MAN)
@@ -6281,14 +6101,6 @@ www_target = www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd
 doc-sync: all
        rsync -rlv --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ $(www_target)/man/
 
-.PHONY: gardel
-gardel:
-       scp man/*.html gardel:public/systemd-man/
-
-.PHONY: lennart-fedora
-lennart-fedora:
-       cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
-
 .PHONY: install-tree
 install-tree: all
        rm -rf $(abs_srcdir)/install-tree