chiark / gitweb /
resolve: add distinct bus error code for hosts that exist but lack A or AAAA records
[elogind.git] / Makefile.am
index cb43ddb081b4a31862beac49fed09f7f790c08fc..ee7066ec27de896ce8be74b23ee95cf26a8370a3 100644 (file)
@@ -35,16 +35,16 @@ SUBDIRS = . po
 # Keep the test-suite.log
 .PRECIOUS: $(TEST_SUITE_LOG) Makefile
 
-LIBUDEV_CURRENT=5
-LIBUDEV_REVISION=1
-LIBUDEV_AGE=4
+LIBUDEV_CURRENT=6
+LIBUDEV_REVISION=0
+LIBUDEV_AGE=5
 
 LIBGUDEV_CURRENT=2
 LIBGUDEV_REVISION=0
 LIBGUDEV_AGE=2
 
 LIBSYSTEMD_CURRENT=3
-LIBSYSTEMD_REVISION=0
+LIBSYSTEMD_REVISION=1
 LIBSYSTEMD_AGE=3
 
 # The following four libraries only exist for compatibility reasons,
@@ -90,6 +90,8 @@ userpresetdir=$(prefix)/lib/systemd/user-preset
 tmpfilesdir=$(prefix)/lib/tmpfiles.d
 sysusersdir=$(prefix)/lib/sysusers.d
 sysctldir=$(prefix)/lib/sysctl.d
+binfmtdir=$(prefix)/lib/binfmt.d
+modulesloaddir=$(prefix)/lib/modules-load.d
 networkdir=$(rootprefix)/lib/systemd/network
 pkgincludedir=$(includedir)/systemd
 systemgeneratordir=$(rootlibexecdir)/system-generators
@@ -104,7 +106,6 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
-ntpunitsdir=$(prefix)/lib/systemd/ntp-units.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -185,6 +186,8 @@ AM_CPPFLAGS = \
        -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
        -DQUOTACHECK=\"$(QUOTACHECK)\" \
        -DKEXEC=\"$(KEXEC)\" \
+       -DLIBDIR=\"$(libdir)\" \
+       -DROOTLIBDIR=\"$(rootlibdir)\" \
        -I $(top_srcdir)/src \
        -I $(top_builddir)/src/shared \
        -I $(top_srcdir)/src/shared \
@@ -297,10 +300,14 @@ define install-relative-aliases
        done
 endef
 
+install-touch-usr-hook:
+       touch -c $(DESTDIR)/$(prefix)
+
 INSTALL_EXEC_HOOKS += \
        install-target-wants-hook \
        install-directories-hook \
-       install-aliases-hook
+       install-aliases-hook \
+       install-touch-usr-hook
 
 # ------------------------------------------------------------------------------
 AM_V_M4 = $(AM_V_M4_$(V))
@@ -329,7 +336,8 @@ rootbin_PROGRAMS = \
        systemd-notify \
        systemd-ask-password \
        systemd-tty-ask-password-agent \
-       systemd-machine-id-setup
+       systemd-machine-id-setup \
+       systemd-escape
 
 bin_PROGRAMS = \
        systemd-cgls \
@@ -338,7 +346,8 @@ bin_PROGRAMS = \
        systemd-detect-virt \
        systemd-delta \
        systemd-analyze \
-       systemd-run
+       systemd-run \
+       systemd-path
 
 dist_bin_SCRIPTS = \
        src/kernel-install/kernel-install
@@ -367,12 +376,12 @@ rootlibexec_PROGRAMS = \
 systemgenerator_PROGRAMS = \
        systemd-getty-generator \
        systemd-fstab-generator \
-       systemd-system-update-generator
+       systemd-system-update-generator \
+       systemd-debug-generator
 
 dist_bashcompletion_DATA = \
        shell-completion/bash/busctl \
        shell-completion/bash/journalctl \
-       shell-completion/bash/systemctl \
        shell-completion/bash/systemd-analyze \
        shell-completion/bash/systemd-cat \
        shell-completion/bash/systemd-cgls \
@@ -384,8 +393,10 @@ dist_bashcompletion_DATA = \
        shell-completion/bash/udevadm \
        shell-completion/bash/kernel-install
 
+nodist_bashcompletion_DATA = \
+       shell-completion/bash/systemctl
+
 dist_zshcompletion_DATA = \
-       shell-completion/zsh/_systemctl \
        shell-completion/zsh/_journalctl \
        shell-completion/zsh/_udevadm \
        shell-completion/zsh/_kernel-install \
@@ -396,13 +407,23 @@ dist_zshcompletion_DATA = \
        shell-completion/zsh/_systemd-delta \
        shell-completion/zsh/_systemd
 
+nodist_zshcompletion_DATA = \
+       shell-completion/zsh/_systemctl
+
+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
 
 dist_systemunit_DATA = \
        units/graphical.target \
        units/multi-user.target \
-       units/emergency.service \
        units/emergency.target \
        units/sysinit.target \
        units/basic.target \
@@ -509,6 +530,9 @@ dist_userunit_DATA = \
 nodist_userunit_DATA = \
        units/user/systemd-exit.service
 
+dist_systempreset_DATA = \
+       system-preset/90-systemd.preset
+
 EXTRA_DIST += \
        units/getty@.service.m4 \
        units/serial-getty@.service.m4 \
@@ -714,6 +738,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/path-util.h \
        src/shared/time-util.c \
        src/shared/time-util.h \
+       src/shared/locale-util.c \
+       src/shared/locale-util.h \
        src/shared/hashmap.c \
        src/shared/hashmap.h \
        src/shared/siphash24.c \
@@ -750,6 +776,8 @@ libsystemd_shared_la_SOURCES = \
        src/shared/pager.h \
        src/shared/socket-util.c \
        src/shared/socket-util.h \
+       src/shared/in-addr-util.c \
+       src/shared/in-addr-util.h \
        src/shared/conf-files.c \
        src/shared/conf-files.h \
        src/shared/cgroup-util.c \
@@ -806,8 +834,6 @@ libsystemd_shared_la_SOURCES = \
        src/shared/bus-label.c \
        src/shared/bus-label.h \
        src/shared/gpt.h \
-       src/shared/generator.h \
-       src/shared/generator.c \
        src/shared/clean-ipc.h \
        src/shared/clean-ipc.c \
        src/shared/login-shared.c \
@@ -819,7 +845,10 @@ libsystemd_shared_la_SOURCES = \
        src/shared/eventfd-util.c \
        src/shared/eventfd-util.h \
        src/shared/copy.c \
-       src/shared/copy.h
+       src/shared/copy.h \
+       src/shared/base-filesystem.c \
+       src/shared/base-filesystem.h \
+       src/shared/nss-util.h
 
 nodist_libsystemd_shared_la_SOURCES = \
        src/shared/errno-from-name.h \
@@ -829,7 +858,8 @@ nodist_libsystemd_shared_la_SOURCES = \
 
 libsystemd_shared_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SECCOMP_CFLAGS)
+       $(SECCOMP_CFLAGS) \
+       -pthread
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
@@ -861,7 +891,11 @@ libsystemd_label_la_SOURCES = \
        src/shared/fileio-label.c \
        src/shared/fileio-label.h \
        src/shared/dev-setup.c \
-       src/shared/dev-setup.h
+       src/shared/dev-setup.h \
+       src/shared/dropin.c \
+       src/shared/dropin.h \
+       src/shared/generator.h \
+       src/shared/generator.c
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1234,7 +1268,12 @@ tests += \
        test-device-nodes \
        test-xml \
        test-architecture \
-       test-socket-util
+       test-socket-util \
+       test-fdset \
+       test-conf-files \
+       test-capability \
+       test-async \
+       test-ratelimit
 
 EXTRA_DIST += \
        test/sched_idle_bad.service \
@@ -1338,6 +1377,31 @@ test_utf8_SOURCES = \
 test_utf8_LDADD = \
        libsystemd-shared.la
 
+test_capability_SOURCES = \
+       src/test/test-capability.c
+
+test_capability_LDADD = \
+       libsystemd-shared.la \
+       libsystemd-capability.la
+
+test_async_SOURCES = \
+       src/test/test-async.c
+
+test_async_LDADD = \
+       libsystemd-shared.la
+
+test_fdset_SOURCES = \
+       src/test/test-fdset.c
+
+test_fdset_LDADD = \
+       libsystemd-core.la
+
+test_ratelimit_SOURCES = \
+       src/test/test-ratelimit.c
+
+test_ratelimit_LDADD = \
+       libsystemd-shared.la
+
 test_util_SOURCES = \
        src/test/test-util.c
 
@@ -1585,12 +1649,18 @@ test_sched_prio_LDADD = \
        libsystemd-core.la \
        $(RT_LIBS)
 
+test_conf_files_SOURCES = \
+       src/test/test-conf-files.c
+
+test_conf_files_LDADD = \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 ## .PHONY so it always rebuilds it
 .PHONY: coverage lcov-run lcov-report coverage-sync
 
 # run lcov from scratch, always
-coverage:
+coverage: all
        $(MAKE) lcov-run
        $(MAKE) lcov-report
 
@@ -1799,17 +1869,50 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
        systemd-sysusers.service
 
-nodist_sysusers_DATA = \
+dist_sysusers_DATA = \
        sysusers.d/systemd.conf
 
+nodist_sysusers_DATA = \
+       sysusers.d/basic.conf
+
 EXTRA_DIST += \
        units/systemd-sysusers.service.in \
-       sysusers.d/systemd.conf.in
+       sysusers.d/basic.conf.in
+
+CLEANFILES += \
+       sysusers.d/basic.conf
 
 INSTALL_DIRS += \
        $(sysusersdir)
 endif
 
+# ------------------------------------------------------------------------------
+if ENABLE_FIRSTBOOT
+systemd_firstboot_SOURCES = \
+       src/firstboot/firstboot.c
+
+systemd_firstboot_LDADD = \
+       libsystemd-units.la \
+       libsystemd-label.la \
+       libsystemd-capability.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la \
+       -lcrypt
+
+rootbin_PROGRAMS += \
+       systemd-firstboot
+
+nodist_systemunit_DATA += \
+       units/systemd-firstboot.service
+
+EXTRA_DIST += \
+       units/systemd-firstboot.service.in
+
+SYSINIT_TARGET_WANTS += \
+       systemd-firstboot.service
+
+endif
+
 # ------------------------------------------------------------------------------
 systemd_machine_id_setup_SOURCES = \
        src/machine-id-setup/machine-id-setup-main.c \
@@ -1877,6 +1980,14 @@ systemd_getty_generator_LDADD = \
        libsystemd-label.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_debug_generator_SOURCES = \
+       src/debug-generator/debug-generator.c
+
+systemd_debug_generator_LDADD = \
+       libsystemd-label.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_fstab_generator_SOURCES = \
        src/fstab-generator/fstab-generator.c \
@@ -2011,6 +2122,13 @@ systemd_cgroups_agent_LDADD = \
        libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
+systemd_escape_SOURCES = \
+       src/escape/escape.c
+
+systemd_escape_LDADD = \
+       libsystemd-shared.la
+
+# -----------------------------------------------------------------------------
 systemctl_SOURCES = \
        src/systemctl/systemctl.c
 
@@ -2031,6 +2149,14 @@ systemd_notify_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+# ------------------------------------------------------------------------------
+systemd_path_SOURCES = \
+       src/path/path.c
+
+systemd_path_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 # ------------------------------------------------------------------------------
 systemd_ask_password_SOURCES = \
        src/ask-password/ask-password.c
@@ -2156,6 +2282,7 @@ libsystemd_internal_la_SOURCES = \
        src/systemd/sd-login.h \
        src/systemd/sd-id128.h \
        src/systemd/sd-daemon.h \
+       src/systemd/sd-path.h \
        src/libsystemd/sd-bus/sd-bus.c \
        src/libsystemd/sd-bus/bus-control.c \
        src/libsystemd/sd-bus/bus-control.h \
@@ -2207,9 +2334,12 @@ libsystemd_internal_la_SOURCES = \
        src/libsystemd/sd-rtnl/rtnl-types.c \
        src/libsystemd/sd-rtnl/rtnl-util.h \
        src/libsystemd/sd-rtnl/rtnl-util.c \
+       src/libsystemd/sd-rtnl/local-addresses.h \
+       src/libsystemd/sd-rtnl/local-addresses.c \
        src/libsystemd/sd-id128/sd-id128.c \
        src/libsystemd/sd-daemon/sd-daemon.c \
-       src/libsystemd/sd-login/sd-login.c
+       src/libsystemd/sd-login/sd-login.c \
+       src/libsystemd/sd-path/sd-path.c
 
 nodist_libsystemd_internal_la_SOURCES = \
        src/libsystemd/libsystemd.sym \
@@ -2312,7 +2442,8 @@ pkginclude_HEADERS += \
        src/systemd/sd-utf8.h \
        src/systemd/sd-event.h \
        src/systemd/sd-rtnl.h \
-       src/systemd/sd-resolve.h
+       src/systemd/sd-resolve.h \
+       src/systemd/sd-path.h
 endif
 
 lib_LTLIBRARIES += \
@@ -2581,7 +2712,18 @@ libsystemd_network_la_SOURCES = \
        src/libsystemd-network/ipv4ll-packet.c \
        src/libsystemd-network/ipv4ll-internal.h \
        src/libsystemd-network/network-internal.c \
-       src/libsystemd-network/network-internal.h
+       src/libsystemd-network/network-internal.h \
+       src/systemd/sd-icmp6-nd.h \
+       src/systemd/sd-dhcp6-client.h \
+       src/systemd/sd-dhcp6-lease.h \
+       src/libsystemd-network/sd-icmp6-nd.c \
+       src/libsystemd-network/sd-dhcp6-client.c \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/dhcp6-protocol.h \
+       src/libsystemd-network/dhcp6-network.c \
+       src/libsystemd-network/dhcp6-option.c \
+       src/libsystemd-network/dhcp6-lease-internal.h \
+       src/libsystemd-network/sd-dhcp6-lease.c
 
 libsystemd_network_la_LIBADD = \
        libudev-internal.la \
@@ -2631,11 +2773,34 @@ test_ipv4ll_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+test_icmp6_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
+
+test_icmp6_rs_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
+test_dhcp6_client_SOURCES = \
+       src/systemd/sd-dhcp6-client.h \
+       src/libsystemd-network/dhcp6-internal.h \
+       src/libsystemd-network/test-dhcp6-client.c
+
+test_dhcp6_client_LDADD = \
+       libsystemd-network.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 tests += \
        test-dhcp-option \
        test-dhcp-client \
        test-dhcp-server \
-       test-ipv4ll
+       test-ipv4ll \
+       test-icmp6-rs \
+       test-dhcp6-client
 
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
@@ -3097,6 +3262,7 @@ CLEANFILES += \
        src/gudev/gudev-1.0.pc
 
 libgudev_1_0_la_SOURCES = \
+       src/gudev/libgudev-1.0.sym \
        src/gudev/gudevenums.h \
        src/gudev/gudevenumtypes.h \
        src/gudev/gudevenumtypes.h\
@@ -3140,8 +3306,9 @@ libgudev_1_0_la_LIBADD = \
 libgudev_1_0_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBGUDEV_CURRENT):$(LIBGUDEV_REVISION):$(LIBGUDEV_AGE) \
-       -export-dynamic -no-undefined \
-       -export-symbols-regex '^g_udev_.*'
+       -export-dynamic \
+       -no-undefined \
+       -Wl,--version-script=$(top_srcdir)/src/gudev/libgudev-1.0.sym
 
 src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
        $(AM_V_at)$(MKDIR_P) $(dir $@)
@@ -3415,6 +3582,20 @@ test_catalog_CPPFLAGS = \
 test_catalog_LDADD = \
        libsystemd-journal-core.la
 
+test_compress_SOURCES = \
+       src/journal/test-compress.c
+
+test_compress_LDADD = \
+       libsystemd-journal-internal.la \
+       libsystemd-shared.la
+
+test_compress_benchmark_SOURCES = \
+       src/journal/test-compress-benchmark.c
+
+test_compress_benchmark_LDADD = \
+       libsystemd-journal-internal.la \
+       libsystemd-shared.la
+
 libsystemd_journal_core_la_SOURCES = \
        src/journal/journald-kmsg.c \
        src/journal/journald-kmsg.h \
@@ -3497,6 +3678,12 @@ tests += \
        test-mmap-cache \
        test-catalog
 
+if HAVE_COMPRESSION
+tests += \
+       test-compress \
+       test-compress-benchmark
+endif
+
 pkginclude_HEADERS += \
        src/systemd/sd-journal.h \
        src/systemd/sd-messages.h \
@@ -3523,15 +3710,15 @@ libsystemd_journal_internal_la_SOURCES = \
        src/journal/mmap-cache.h
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
-libsystemd_journal_internal_la_CFLAGS =
+libsystemd_journal_internal_la_CFLAGS = \
        $(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD =
 
-if HAVE_XZ
 libsystemd_journal_internal_la_SOURCES += \
        src/journal/compress.c
 
+if HAVE_XZ
 libsystemd_journal_internal_la_CFLAGS += \
        $(XZ_CFLAGS)
 
@@ -3539,6 +3726,11 @@ libsystemd_journal_internal_la_LIBADD += \
        $(XZ_LIBS)
 endif
 
+if HAVE_LZ4
+libsystemd_journal_internal_la_LIBADD += \
+       -llz4
+endif
+
 if HAVE_GCRYPT
 libsystemd_journal_internal_la_SOURCES += \
        src/journal/journal-authenticate.c \
@@ -3664,7 +3856,9 @@ systemd_socket_proxyd_LDADD = \
 # ------------------------------------------------------------------------------
 if ENABLE_COREDUMP
 systemd_coredump_SOURCES = \
-       src/journal/coredump.c
+       src/journal/coredump.c \
+       src/journal/coredump-vacuum.c \
+       src/journal/coredump-vacuum.h
 
 systemd_coredump_LDADD = \
        libsystemd-journal-internal.la \
@@ -3672,25 +3866,57 @@ systemd_coredump_LDADD = \
        libsystemd-internal.la \
        libsystemd-shared.la
 
+if HAVE_ELFUTILS
+systemd_coredump_SOURCES += \
+       src/journal/stacktrace.c \
+       src/journal/stacktrace.h
+
+systemd_coredump_LDADD += \
+       $(ELFUTILS_LIBS)
+endif
+
 rootlibexec_PROGRAMS += \
        systemd-coredump
 
-systemd_coredumpctl_SOURCES = \
+dist_pkgsysconf_DATA += \
+       src/journal/coredump.conf
+
+if HAVE_ACL
+systemd_coredump_LDADD += \
+       libsystemd-acl.la
+endif
+
+coredumpctl_SOURCES = \
        src/journal/coredumpctl.c
 
-systemd_coredumpctl_LDADD = \
+coredumpctl_LDADD = \
        libsystemd-journal-internal.la \
        libsystemd-internal.la \
        libsystemd-shared.la
 
 bin_PROGRAMS += \
-       systemd-coredumpctl
+       coredumpctl
+
+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
+
+test_coredump_vacuum_LDADD = \
+       libsystemd-internal.la \
+       libsystemd-shared.la
 
 dist_bashcompletion_DATA += \
-       shell-completion/bash/systemd-coredumpctl
+       shell-completion/bash/coredumpctl
 
 dist_zshcompletion_DATA += \
-       shell-completion/zsh/_systemd-coredumpctl
+       shell-completion/zsh/_coredumpctl
+
+GENERAL_ALIASES += \
+       $(bindir)/coredumpctl $(bindir)/systemd-coredumpctl
 
 sysctl_DATA = \
        sysctl.d/50-coredump.conf
@@ -3919,7 +4145,8 @@ systemgenerator_PROGRAMS += \
        systemd-cryptsetup-generator
 
 dist_systemunit_DATA += \
-       units/cryptsetup.target
+       units/cryptsetup.target \
+       units/cryptsetup-pre.target
 
 systemd_cryptsetup_SOURCES = \
        src/cryptsetup/cryptsetup.c
@@ -4110,10 +4337,6 @@ dist_systemunit_DATA += \
 polkitpolicy_files += \
        src/timedate/org.freedesktop.timedate1.policy
 
-INSTALL_DIRS += \
-       $(prefix)/lib/systemd/ntp-units.d \
-       $(sysconfdir)/systemd/ntp-units.d
-
 SYSTEM_UNIT_ALIASES += \
        systemd-timedated.service dbus-org.freedesktop.timedate1.service
 
@@ -4173,6 +4396,9 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
        units/systemd-timesyncd.service
 
+GENERAL_ALIASES += \
+       $(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-timesyncd.service
+
 EXTRA_DIST += \
        units/systemd-timesyncd.service.in
 
@@ -4184,18 +4410,13 @@ EXTRA_DIST += \
 
 CLEANFILES += \
        src/timesync/timesyncd.conf
-
-dist_ntpunits_DATA = \
-       src/timesync/90-systemd.list
-
 endif
 
 # ------------------------------------------------------------------------------
 if HAVE_MYHOSTNAME
 libnss_myhostname_la_SOURCES = \
-       src/nss-myhostname/nss-myhostname.c \
-       src/nss-myhostname/ifconf.h \
-       src/nss-myhostname/netlink.c
+       src/nss-myhostname/nss-myhostname.sym \
+       src/nss-myhostname/nss-myhostname.c
 
 libnss_myhostname_la_LDFLAGS = \
        $(AM_LDFLAGS) \
@@ -4203,7 +4424,8 @@ libnss_myhostname_la_LDFLAGS = \
        -export-dynamic \
        -avoid-version \
        -shared \
-       -shrext .so.2
+       -shrext .so.2 \
+       -Wl,--version-script=$(top_srcdir)/src/nss-myhostname/nss-myhostname.sym
 
 libnss_myhostname_la_LIBADD = \
        libsystemd-shared.la \
@@ -4288,6 +4510,25 @@ BUSNAMES_TARGET_WANTS += \
 EXTRA_DIST += \
        units/systemd-machined.service.in
 
+libnss_mymachines_la_SOURCES = \
+       src/nss-mymachines/nss-mymachines.sym \
+       src/nss-mymachines/nss-mymachines.c
+
+libnss_mymachines_la_LDFLAGS = \
+       $(AM_LDFLAGS) \
+       -module \
+       -export-dynamic \
+       -avoid-version \
+       -shared \
+       -shrext .so.2 \
+       -Wl,--version-script=$(top_srcdir)/src/nss-mymachines/nss-mymachines.sym
+
+libnss_mymachines_la_LIBADD = \
+       libsystemd-shared.la \
+       libsystemd-internal.la
+
+lib_LTLIBRARIES += \
+       libnss_mymachines.la
 endif
 
 # ------------------------------------------------------------------------------
@@ -4295,11 +4536,22 @@ if ENABLE_RESOLVED
 systemd_resolved_SOURCES = \
        src/resolve/resolved.h \
        src/resolve/resolved.c \
-       src/resolve/resolved-manager.c
-
-systemd_resolved_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(KMOD_CFLAGS)
+       src/resolve/resolved-manager.c \
+       src/resolve/resolved-bus.c \
+       src/resolve/resolved-link.h \
+       src/resolve/resolved-link.c \
+       src/resolve/resolved-dns-domain.h \
+       src/resolve/resolved-dns-domain.c \
+       src/resolve/resolved-dns-packet.h \
+       src/resolve/resolved-dns-packet.c \
+       src/resolve/resolved-dns-query.h \
+       src/resolve/resolved-dns-query.c \
+       src/resolve/resolved-dns-scope.h \
+       src/resolve/resolved-dns-scope.c \
+       src/resolve/resolved-dns-server.h \
+       src/resolve/resolved-dns-server.c \
+       src/resolve/resolved-dns-rr.h \
+       src/resolve/resolved-dns-rr.c
 
 nodist_systemd_resolved_SOURCES = \
        src/resolve/resolved-gperf.c
@@ -4338,6 +4590,21 @@ EXTRA_DIST += \
 CLEANFILES += \
        src/resolve/resolved.conf
 
+tests += \
+       test-dns-domain
+
+test_dns_domain_SOURCES = \
+       src/resolve/resolved-dns-domain.h \
+       src/resolve/resolved-dns-domain.c \
+       src/resolve/test-dns-domain.c
+
+test_dns_domain_LDADD = \
+       libsystemd-capability.la \
+       libsystemd-network.la \
+       libsystemd-label.la \
+       libsystemd-internal.la \
+       libsystemd-shared.la
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -4361,15 +4628,32 @@ libsystemd_networkd_core_la_CFLAGS = \
 libsystemd_networkd_core_la_SOURCES = \
        src/libsystemd-network/network-internal.h \
        src/network/networkd.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-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-tunnel.c \
-       src/network/networkd-veth.c \
-       src/network/networkd-vxlan.c \
+       src/network/networkd-netdev-tunnel.c \
+       src/network/networkd-netdev-veth.c \
+       src/network/networkd-netdev-vxlan.c \
+       src/network/networkd-netdev-vlan.c \
+       src/network/networkd-netdev-macvlan.c \
+       src/network/networkd-netdev-dummy.c \
+       src/network/networkd-netdev-tuntap.c \
+       src/network/networkd-netdev-bond.c \
+       src/network/networkd-netdev-bridge.c \
+       src/network/networkd-link.c \
        src/network/networkd-network.c \
        src/network/networkd-address.c \
        src/network/networkd-route.c \
-       src/network/networkd-manager.c
+       src/network/networkd-manager.c \
+       src/network/networkd-address-pool.c
 
 nodist_libsystemd_networkd_core_la_SOURCES = \
        src/network/networkd-network-gperf.c \
@@ -4560,7 +4844,8 @@ tests += \
 
 if HAVE_PAM
 pam_systemd_la_SOURCES = \
-       src/login/pam-module.c
+       src/login/pam_systemd.sym \
+       src/login/pam_systemd.c
 
 pam_systemd_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -4573,7 +4858,7 @@ pam_systemd_la_LDFLAGS = \
        -export-dynamic \
        -avoid-version \
        -shared \
-       -export-symbols-regex '^pam_sm_.*'
+       -Wl,--version-script=$(top_srcdir)/src/login/pam_systemd.sym
 
 pam_systemd_la_LIBADD = \
        libsystemd-capability.la \
@@ -4688,10 +4973,12 @@ _journal_la_LIBADD = \
 
 id128_la_SOURCES = \
        src/python-systemd/id128.c \
-       src/python-systemd/id128-constants.h \
        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 \
@@ -4986,7 +5273,11 @@ substitutions = \
        '|DNS_SERVERS=$(DNS_SERVERS)|' \
        '|systemuidmax=$(SYSTEM_UID_MAX)|' \
        '|systemgidmax=$(SYSTEM_GID_MAX)|' \
-       '|TTY_GID=$(TTY_GID)|'
+       '|TTY_GID=$(TTY_GID)|' \
+       '|systemsleepdir=$(systemsleepdir)|' \
+       '|systemshutdowndir=$(systemshutdowndir)|' \
+       '|binfmtdir=$(binfmtdir)|' \
+       '|modulesloaddir=$(modulesloaddir)|'
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -5011,6 +5302,9 @@ src/core/macros.%: src/core/macros.%.in
 src/%.policy.in: src/%.policy.in.in
        $(SED_PROCESS)
 
+shell-completion/%: shell-completion/%.in
+       $(SED_PROCESS)
+
 %.rules: %.rules.in
        $(SED_PROCESS)
 
@@ -5271,11 +5565,34 @@ DISTCHECK_CONFIGURE_FLAGS += \
        --with-sysvrcnd-path=
 endif
 
+if HAVE_PYTHON
+DISTCHECK_CONFIGURE_FLAGS += \
+       --with-python
+endif
+
 if ENABLE_GTK_DOC
 DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
 endif
 
+#
+# Require python when making dist
+#
+.PHONY: dist-check-python
+dist-check-python:
+if !HAVE_PYTHON
+       @echo "*** python and python-lxml module must be installed and enabled in order to make dist"
+       @false
+endif
+
+dist-check-compat-libs:
+if !ENABLE_COMPAT_LIBS
+       @echo "*** compat-libs must be enabled in order to make dist"
+       @false
+endif
+
+dist: dist-check-python dist-check-compat-libs
+
 # check "broken" platforms limited toolchains for link breakage before we release
 .PHONY: linkcheck
 linkcheck:
@@ -5337,7 +5654,7 @@ valgrind-tests: $(TESTS)
        done
 
 exported-%: %
-       $(AM_V_GEN)nm -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
+       $(AM_V_GEN)$(NM) -g --defined-only $(builddir)/.libs/$(<:.la=.so) 2>&1 /dev/null | grep " T " | cut -d" " -f3 > $@
 
 exported: $(addprefix exported-, $(lib_LTLIBRARIES))
        $(AM_V_GEN)cat $^ > $@
@@ -5357,7 +5674,7 @@ ALL_OBJECTS:=$(foreach v,$(OBJECT_VARIABLES),$($(v)))
 
 undefined defined: $(ALL_OBJECTS)
        $(AM_V_GEN)for f in $(ALL_OBJECTS) ; do \
-               nm -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
+               $(NM) -g --$@-only `echo $(builddir)/"$$f" | sed -e 's,\([^/]*\).lo$$,.libs/\1.o,'` ; \
        done | cut -c 20- | cut -d @ -f 1 | sort -u > $@
 
 CLEANFILES += \
@@ -5395,7 +5712,8 @@ test-libsystemd-sym.c: \
                src/systemd/sd-login.h \
                src/systemd/sd-bus.h \
                src/systemd/sd-utf8.h \
-               src/systemd/sd-resolve.h
+               src/systemd/sd-resolve.h \
+               src/systemd/sd-path.h
        $(generate-sym-test)
 
 test-libudev-sym.c: \