X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=94eeb114ab010b29991b1213e7c8ecd1fcbeaddb;hp=734e5c148ec43f0766969cd2b869b3895f1a7f47;hb=b5df2eabf3fdd3e1663bc4c948812472084f3e96;hpb=2de30868edab5b099cb1e5413e47ed11ded4cc63

diff --git a/Makefile.am b/Makefile.am
index 734e5c148..94eeb114a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -106,6 +106,8 @@ udevrulesdir=$(udevlibexecdir)/rules.d
 udevhwdbdir=$(udevlibexecdir)/hwdb.d
 catalogdir=$(prefix)/lib/systemd/catalog
 kernelinstalldir = $(prefix)/lib/kernel/install.d
+factory_etcdir = $(prefix)/share/factory/etc
+factory_pamdir = $(prefix)/share/factory/etc/pam.d
 
 # And these are the special ones for /
 rootprefix=@rootprefix@
@@ -133,8 +135,8 @@ polkitpolicy_in_files =
 polkitpolicy_files =
 dist_udevrules_DATA =
 nodist_udevrules_DATA =
-nodist_pkgsysconf_DATA =
 dist_pkgsysconf_DATA =
+nodist_pkgsysconf_DATA =
 dist_pkgdata_DATA =
 dist_dbuspolicy_DATA =
 dist_dbussystemservice_DATA =
@@ -164,6 +166,7 @@ AM_CPPFLAGS = \
 	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
 	-DUSER_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/user\" \
 	-DUSER_DATA_UNIT_PATH=\"$(userunitdir)\" \
+	-DCERTIFICATE_ROOT=\"$(CERTIFICATEROOT)\" \
 	-DCATALOG_DATABASE=\"$(catalogstatedir)/database\" \
 	-DSYSTEMD_CGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
 	-DSYSTEMD_BINARY_PATH=\"$(rootlibexecdir)/systemd\" \
@@ -188,6 +191,7 @@ AM_CPPFLAGS = \
 	-DKEXEC=\"$(KEXEC)\" \
 	-DLIBDIR=\"$(libdir)\" \
 	-DROOTLIBDIR=\"$(rootlibdir)\" \
+	-DTEST_DIR=\"$(abs_top_srcdir)/test\" \
 	-I $(top_srcdir)/src \
 	-I $(top_builddir)/src/shared \
 	-I $(top_srcdir)/src/shared \
@@ -208,6 +212,7 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/libsystemd/sd-event \
 	-I $(top_srcdir)/src/libsystemd/sd-rtnl \
 	-I $(top_srcdir)/src/libsystemd-network \
+	-I $(top_srcdir)/src/libsystemd-terminal \
 	$(OUR_CPPFLAGS)
 
 AM_CFLAGS = $(OUR_CFLAGS)
@@ -382,7 +387,6 @@ systemgenerator_PROGRAMS = \
 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 \
@@ -394,8 +398,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 \
@@ -403,16 +409,28 @@ dist_zshcompletion_DATA = \
 	shell-completion/zsh/_systemd-analyze \
 	shell-completion/zsh/_systemd-run \
 	shell-completion/zsh/_sd_hosts_or_user_at_host \
+	shell-completion/zsh/_sd_outputmodes \
+	shell-completion/zsh/_sd_unit_files \
 	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 \
@@ -829,10 +847,12 @@ libsystemd_shared_la_SOURCES = \
 	src/shared/login-shared.h \
 	src/shared/ring.c \
 	src/shared/ring.h \
+	src/shared/barrier.c \
+	src/shared/barrier.h \
+	src/shared/pty.c \
+	src/shared/pty.h \
 	src/shared/async.c \
 	src/shared/async.h \
-	src/shared/eventfd-util.c \
-	src/shared/eventfd-util.h \
 	src/shared/copy.c \
 	src/shared/copy.h \
 	src/shared/base-filesystem.c \
@@ -1208,14 +1228,13 @@ CLEANFILES += \
 	src/core/org.freedesktop.systemd1.policy.in
 
 # ------------------------------------------------------------------------------
+
 manual_tests += \
-	test-engine \
 	test-ns \
 	test-loopback \
 	test-hostname \
 	test-daemon \
 	test-cgroup \
-	test-cgroup-mask \
 	test-install \
 	test-watchdog \
 	test-log \
@@ -1227,6 +1246,8 @@ manual_tests += \
 endif
 
 tests += \
+	test-engine \
+	test-cgroup-mask \
 	test-job-type \
 	test-env-replace \
 	test-strbuf \
@@ -1239,6 +1260,8 @@ tests += \
 	test-ellipsize \
 	test-util \
 	test-ring \
+	test-barrier \
+	test-pty \
 	test-tmpfiles \
 	test-namespace \
 	test-date \
@@ -1265,14 +1288,36 @@ tests += \
 	test-ratelimit
 
 EXTRA_DIST += \
+	test/a.service \
+	test/basic.target \
+	test/b.service \
+	test/c.service \
+	test/daughter.service \
+	test/d.service \
+	test/end.service \
+	test/e.service \
+	test/f.service \
+	test/grandchild.service \
+	test/g.service \
+	test/hello-after-sleep.target \
+	test/hello.service \
+	test/h.service \
+	test/parent-deep.slice \
+	test/parent.slice \
+	test/paths.target \
 	test/sched_idle_bad.service \
 	test/sched_idle_ok.service \
 	test/sched_rr_bad.service \
-	test/sched_rr_ok.service \
 	test/sched_rr_change.service \
+	test/sched_rr_ok.service \
+	test/shutdown.target \
+	test/sleep.service \
+	test/sockets.target \
 	test/son.service \
-	test/daughter.service \
-	test/parent.slice
+	test/sysinit.target \
+	test/testsuite.target \
+	test/timers.target \
+	test/unstoppable.service
 
 EXTRA_DIST += \
 	src/test/test-helper.h
@@ -1409,6 +1454,18 @@ test_ring_SOURCES = \
 test_ring_LDADD = \
 	libsystemd-core.la
 
+test_barrier_SOURCES = \
+	src/test/test-barrier.c
+
+test_barrier_LDADD = \
+	libsystemd-core.la
+
+test_pty_SOURCES = \
+	src/test/test-pty.c
+
+test_pty_LDADD = \
+	libsystemd-core.la
+
 test_tmpfiles_SOURCES = \
 	src/test/test-tmpfiles.c
 
@@ -1441,7 +1498,15 @@ test_list_LDADD = \
 
 test_tables_SOURCES = \
 	src/test/test-tables.c \
-	src/shared/test-tables.h
+	src/shared/test-tables.h \
+	src/bus-proxyd/bus-policy.c \
+	src/bus-proxyd/bus-policy.h \
+	src/journal/journald-server.c \
+	src/journal/journald-server.h
+
+test_tables_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	-I$(top_srcdir)/src/bus-proxyd
 
 test_tables_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -1450,7 +1515,9 @@ test_tables_CFLAGS = \
 test_tables_LDADD = \
 	libsystemd-logs.la \
 	libsystemd-journal-internal.la \
+	libsystemd-journal-core.la \
 	libsystemd-core.la \
+	libudev-core.la \
 	$(RT_LIBS)
 
 test_prioq_SOURCES = \
@@ -1684,11 +1751,19 @@ endif
 
 # ------------------------------------------------------------------------------
 systemd_analyze_SOURCES = \
-	src/analyze/analyze.c
+	src/analyze/analyze.c \
+	src/analyze/analyze-verify.c \
+	src/analyze/analyze-verify.h
+
+systemd_verify_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(SECCOMP_CFLAGS)
 
 systemd_analyze_LDADD = \
+	libsystemd-core.la \
 	libsystemd-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	$(RT_LIBS)
 
 # ------------------------------------------------------------------------------
 systemd_initctl_SOURCES = \
@@ -1717,6 +1792,7 @@ systemd_update_done_SOURCES = \
 
 systemd_update_done_LDADD = \
 	libsystemd-internal.la \
+	libsystemd-label.la \
 	libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
@@ -1807,6 +1883,7 @@ nodist_systemunit_DATA += \
 dist_tmpfiles_DATA = \
 	tmpfiles.d/systemd.conf \
 	tmpfiles.d/systemd-nologin.conf \
+	tmpfiles.d/systemd-remote.conf \
 	tmpfiles.d/tmp.conf \
 	tmpfiles.d/x11.conf \
 	tmpfiles.d/var.conf \
@@ -1859,7 +1936,8 @@ SYSINIT_TARGET_WANTS += \
 	systemd-sysusers.service
 
 dist_sysusers_DATA = \
-	sysusers.d/systemd.conf
+	sysusers.d/systemd.conf \
+	sysusers.d/systemd-remote.conf
 
 nodist_sysusers_DATA = \
 	sysusers.d/basic.conf
@@ -1875,6 +1953,14 @@ INSTALL_DIRS += \
 	$(sysusersdir)
 endif
 
+# ------------------------------------------------------------------------------
+dist_factory_etc_DATA = \
+	factory/etc/nsswitch.conf
+
+dist_factory_pam_DATA = \
+	factory/etc/pam.d/system-auth \
+	factory/etc/pam.d/other
+
 # ------------------------------------------------------------------------------
 if ENABLE_FIRSTBOOT
 systemd_firstboot_SOURCES = \
@@ -1899,7 +1985,6 @@ EXTRA_DIST += \
 
 SYSINIT_TARGET_WANTS += \
 	systemd-firstboot.service
-
 endif
 
 # ------------------------------------------------------------------------------
@@ -2791,6 +2876,81 @@ tests += \
 	test-icmp6-rs \
 	test-dhcp6-client
 
+# ------------------------------------------------------------------------------
+if ENABLE_TERMINAL
+noinst_LTLIBRARIES += \
+	libsystemd-terminal.la
+
+noinst_PROGRAMS += \
+	systemd-subterm
+
+unifontdatadir=$(datadir)/unifont
+
+dist_unifontdata_DATA = \
+	src/libsystemd-terminal/unifont-glyph-array.bin
+
+tests += \
+	test-term-page \
+	test-term-parser \
+	test-unifont
+endif
+
+libsystemd_terminal_la_CFLAGS = \
+	$(AM_CFLAGS)
+
+libsystemd_terminal_la_SOURCES = \
+	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.c
+
+libsystemd_terminal_la_LIBADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+systemd_subterm_SOURCES = \
+	src/libsystemd-terminal/subterm.c
+
+systemd_subterm_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_term_page_SOURCES = \
+	src/libsystemd-terminal/test-term-page.c
+
+test_term_page_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_term_parser_SOURCES = \
+	src/libsystemd-terminal/test-term-parser.c
+
+test_term_parser_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+test_unifont_SOURCES = \
+	src/libsystemd-terminal/test-unifont.c
+
+test_unifont_LDADD = \
+	libsystemd-terminal.la \
+	libsystemd-internal.la \
+	libsystemd-shared.la
+
+.PHONY: update-unifont
+update-unifont: tools/compile-unifont.py
+	$(AM_V_GEN)$(PYTHON) $< \
+		<$(top_srcdir)/src/libsystemd-terminal/unifont.hex \
+		>$(top_srcdir)/src/libsystemd-terminal/unifont-glyph-array.bin
+	@echo "unifont-glyph-array.bin has been regenerated"
+
 # ------------------------------------------------------------------------------
 if ENABLE_GTK_DOC
 SUBDIRS += \
@@ -3360,16 +3520,6 @@ typelibs_DATA = \
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
-
-# move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
-libgudev-install-hook:
-	libname=libgudev-1.0.so && $(move-to-rootlibdir)
-
-libgudev-uninstall-hook:
-	rm -f $(DESTDIR)$(rootlibdir)/libgudev-1.0.so*
-
-INSTALL_EXEC_HOOKS += libgudev-install-hook
-UNINSTALL_EXEC_HOOKS += libgudev-uninstall-hook
 endif
 
 EXTRA_DIST += \
@@ -3438,19 +3588,20 @@ rootlibexec_PROGRAMS += \
 	systemd-journal-remote
 
 systemd_journal_remote_SOURCES = \
-	src/journal/journal-remote-parse.h \
-	src/journal/journal-remote-parse.c \
-	src/journal/journal-remote-write.h \
-	src/journal/journal-remote-write.c \
-	src/journal/journal-remote.c
+	src/journal-remote/journal-remote-parse.h \
+	src/journal-remote/journal-remote-parse.c \
+	src/journal-remote/journal-remote-write.h \
+	src/journal-remote/journal-remote-write.c \
+	src/journal-remote/journal-remote.h \
+	src/journal-remote/journal-remote.c
 
 systemd_journal_remote_LDADD = \
 	libsystemd-internal.la \
 	libsystemd-journal-core.la
 
 systemd_journal_remote_SOURCES += \
-	src/journal/microhttpd-util.h \
-	src/journal/microhttpd-util.c
+	src/journal-remote/microhttpd-util.h \
+	src/journal-remote/microhttpd-util.c
 
 systemd_journal_remote_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -3462,7 +3613,70 @@ systemd_journal_remote_LDADD += \
 if HAVE_GNUTLS
 systemd_journal_remote_LDADD += \
 	$(GNUTLS_LIBS)
+
+# systemd-journal-remote make sense mostly with full crypto stack
+dist_systemunit_DATA += \
+	units/systemd-journal-remote.socket
+
+nodist_systemunit_DATA += \
+	units/systemd-journal-remote.service
+
+EXTRA_DIST += \
+	units/systemd-journal-remote.service.in
+
+journal-remote-install-hook: journal-install-hook
+	-$(MKDIR_P) $(DESTDIR)/var/log/journal/remote
+	-chown 0:0 $(DESTDIR)/var/log/journal/remote
+	-chmod 755 $(DESTDIR)/var/log/journal/remote
+
+INSTALL_EXEC_HOOKS += journal-remote-install-hook
+
+endif
+
+nodist_pkgsysconf_DATA += \
+	src/journal-remote/journal-remote.conf
+
+EXTRA_DIST += \
+	src/journal-remote/journal-remote.conf.in
+
+CLEANFILES += \
+	src/journal-remote/journal-remote.conf
 endif
+
+if HAVE_LIBCURL
+rootlibexec_PROGRAMS += \
+	systemd-journal-upload
+
+systemd_journal_upload_SOURCES = \
+	src/journal-remote/journal-upload.h \
+	src/journal-remote/journal-upload.c \
+	src/journal-remote/journal-upload-journal.c
+
+systemd_journal_upload_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(LIBCURL_CFLAGS)
+
+systemd_journal_upload_LDADD = \
+	libsystemd-core.la \
+	libsystemd-internal.la \
+	libsystemd-journal-internal.la \
+	libsystemd-shared.la \
+	$(LIBCURL_LIBS)
+
+nodist_systemunit_DATA += \
+	units/systemd-journal-upload.service
+
+EXTRA_DIST += \
+	units/systemd-journal-upload.service.in
+
+nodist_pkgsysconf_DATA += \
+	src/journal-remote/journal-upload.conf
+
+EXTRA_DIST += \
+	src/journal-remote/journal-upload.conf.in
+
+CLEANFILES += \
+	src/journal-remote/journal-upload.conf
 endif
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
@@ -3631,6 +3845,7 @@ journal-install-hook:
 	-setfacl -nm g:wheel:rx,d:g:wheel:rx $(DESTDIR)/var/log/journal/
 
 journal-uninstall-hook:
+	-rmdir $(DESTDIR)/var/log/journal/remote
 	-rmdir $(DESTDIR)/var/log/journal/
 
 INSTALL_EXEC_HOOKS += journal-install-hook
@@ -3667,9 +3882,11 @@ tests += \
 	test-mmap-cache \
 	test-catalog
 
+if HAVE_COMPRESSION
 tests += \
 	test-compress \
 	test-compress-benchmark
+endif
 
 pkginclude_HEADERS += \
 	src/systemd/sd-journal.h \
@@ -3790,9 +4007,9 @@ rootlibexec_PROGRAMS += \
 	systemd-journal-gatewayd
 
 systemd_journal_gatewayd_SOURCES = \
-	src/journal/journal-gatewayd.c \
-	src/journal/microhttpd-util.h \
-	src/journal/microhttpd-util.c
+	src/journal-remote/journal-gatewayd.c \
+	src/journal-remote/microhttpd-util.h \
+	src/journal-remote/microhttpd-util.c
 
 systemd_journal_gatewayd_LDADD = \
 	libsystemd-logs.la \
@@ -3821,7 +4038,7 @@ nodist_systemunit_DATA += \
 	units/systemd-journal-gatewayd.service
 
 dist_gatewayddocumentroot_DATA = \
-	src/journal/browse.html
+	src/journal-remote/browse.html
 
 endif
 
@@ -3902,9 +4119,6 @@ dist_bashcompletion_DATA += \
 dist_zshcompletion_DATA += \
 	shell-completion/zsh/_coredumpctl
 
-GENERAL_ALIASES += \
-	$(bindir)/coredumpctl $(bindir)/systemd-coredumpctl
-
 sysctl_DATA = \
 	sysctl.d/50-coredump.conf
 
@@ -4267,9 +4481,6 @@ dist_pkgdata_DATA += \
 dist_noinst_SCRIPT = \
 	src/locale/generate-kbd-model-map
 
-update-kbd-model-map: src/locale/generate-kbd-model-map
-	$PYTHON $< >src/locale/kbd-model-map
-
 localectl_SOURCES = \
 	src/locale/localectl.c
 
@@ -4384,7 +4595,7 @@ nodist_systemunit_DATA += \
 	units/systemd-timesyncd.service
 
 GENERAL_ALIASES += \
-	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-timesyncd.service
+	$(systemunitdir)/systemd-timesyncd.service $(pkgsysconfdir)/system/sysinit.target.wants/systemd-timesyncd.service
 
 EXTRA_DIST += \
 	units/systemd-timesyncd.service.in
@@ -4497,6 +4708,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
 
 # ------------------------------------------------------------------------------
@@ -4504,11 +4734,32 @@ 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-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 \
+	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-cache.h \
+	src/resolve/resolved-dns-cache.c \
+	src/resolve/resolved-dns-zone.h \
+	src/resolve/resolved-dns-zone.c \
+	src/resolve/resolved-dns-stream.h \
+	src/resolve/resolved-dns-stream.c
 
 nodist_systemd_resolved_SOURCES = \
 	src/resolve/resolved-gperf.c
@@ -4524,7 +4775,8 @@ systemd_resolved_LDADD = \
 	libsystemd-network.la \
 	libsystemd-label.la \
 	libsystemd-internal.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	-lm
 
 rootlibexec_PROGRAMS += \
 	systemd-resolved
@@ -4532,9 +4784,24 @@ rootlibexec_PROGRAMS += \
 nodist_systemunit_DATA += \
 	units/systemd-resolved.service
 
+dist_systemunit_DATA += \
+	units/org.freedesktop.resolve1.busname
+
+dist_dbuspolicy_DATA += \
+	src/resolve/org.freedesktop.resolve1.conf
+
+dist_dbussystemservice_DATA += \
+	src/resolve/org.freedesktop.resolve1.service
+
 EXTRA_DIST += \
 	units/systemd-resolved.service.in
 
+SYSTEM_UNIT_ALIASES += \
+	systemd-resolved.service dbus-org.freedesktop.resolve1.service
+
+BUSNAMES_TARGET_WANTS += \
+	org.freedesktop.resolve1.busname
+
 GENERAL_ALIASES += \
 	$(systemunitdir)/systemd-resolved.service $(pkgsysconfdir)/system/multi-user.target.wants/systemd-resolved.service
 
@@ -4547,6 +4814,62 @@ 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
+
+libnss_resolve_la_SOURCES = \
+	src/nss-resolve/nss-resolve.sym \
+	src/nss-resolve/nss-resolve.c
+
+libnss_resolve_la_LDFLAGS = \
+	$(AM_LDFLAGS) \
+	-module \
+	-export-dynamic \
+	-avoid-version \
+	-shared \
+	-shrext .so.2 \
+	-Wl,--version-script=$(top_srcdir)/src/nss-resolve/nss-resolve.sym
+
+libnss_resolve_la_LIBADD = \
+	libsystemd-shared.la \
+	libsystemd-internal.la
+
+lib_LTLIBRARIES += \
+	libnss_resolve.la
+
+systemd_resolve_host_SOURCES = \
+	src/resolve-host/resolve-host.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-domain.c \
+	src/resolve/resolved-dns-domain.h
+
+systemd_resolve_host_LDADD = \
+	libsystemd-internal.la \
+	libsystemd-shared.la \
+	-lm
+
+rootlibexec_PROGRAMS += \
+	systemd-resolve-host
+
 endif
 
 # ------------------------------------------------------------------------------
@@ -4570,16 +4893,27 @@ 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-vlan.c \
-	src/network/networkd-macvlan.c \
-	src/network/networkd-dummy.c \
-	src/network/networkd-tuntap.c \
-	src/network/networkd-bond.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 \
@@ -4605,8 +4939,11 @@ systemd_networkd_wait_online_CFLAGS = \
 
 systemd_networkd_wait_online_SOURCES = \
 	src/libsystemd-network/network-internal.h \
+	src/network/networkd-wait-online.h \
+	src/network/networkd-wait-online-link.h \
 	src/network/networkd-wait-online.c \
-	src/network/networkd-wait-online.h
+	src/network/networkd-wait-online-manager.c \
+	src/network/networkd-wait-online-link.c
 
 systemd_networkd_wait_online_LDADD = \
 	libsystemd-network.la \
@@ -4623,8 +4960,17 @@ test_network_CFLAGS = \
 test_network_LDADD = \
 	libsystemd-networkd-core.la
 
+test_network_tables_SOURCES = \
+	src/network/test-network-tables.c \
+	src/shared/test-tables.h
+
+test_network_tables_LDADD = \
+	libsystemd-networkd-core.la \
+	libudev-core.la
+
 tests += \
-	test-network
+	test-network \
+	test-network-tables
 
 nodist_systemunit_DATA += \
 	units/systemd-networkd.service \
@@ -5175,6 +5521,7 @@ substitutions = \
        '|sysctldir=$(sysctldir)|' \
        '|systemgeneratordir=$(systemgeneratordir)|' \
        '|usergeneratordir=$(usergeneratordir)|' \
+       '|CERTIFICATEROOT=$(CERTIFICATEROOT)|' \
        '|PACKAGE_VERSION=$(PACKAGE_VERSION)|' \
        '|PACKAGE_NAME=$(PACKAGE_NAME)|' \
        '|PACKAGE_URL=$(PACKAGE_URL)|' \
@@ -5227,12 +5574,18 @@ sysctl.d/%: sysctl.d/%.in
 %.pc: %.pc.in
 	$(SED_PROCESS)
 
+%.conf: %.conf.in
+	$(SED_PROCESS)
+
 src/core/macros.%: src/core/macros.%.in
 	$(SED_PROCESS)
 
 src/%.policy.in: src/%.policy.in.in
 	$(SED_PROCESS)
 
+shell-completion/%: shell-completion/%.in
+	$(SED_PROCESS)
+
 %.rules: %.rules.in
 	$(SED_PROCESS)
 
@@ -5260,7 +5613,7 @@ units/user/%: units/%.m4
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 if ENABLE_POLKIT
-dist_polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
 	$(polkitpolicy_files) \
 	$(polkitpolicy_in_in_files:.policy.in.in=.policy)
 endif