Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts:
#	build-aux/Makefile.once.head/20-systemd.mk
#	build-aux/Makefile.once.tail/20-systemd.mk
#	config.mk.in
#	src/libbasic/Makefile
#	src/libshared/Makefile
#	src/libsystemd/libsystemd-internal/Makefile

88 files changed, 88 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index d424b5c36e..056d04db28 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6506,4 +6506,5 @@ list-keys:
 add-key:
 	gpg --verbose --no-options --no-default-keyring --no-auto-key-locate --batch --trust-model=always --keyring=$(srcdir)/src/import/import-pubring.gpg --import -
 #@all
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/discard.mk b/discard.mk
index 54dbd80bb1..d292f3b893 100644
--- a/discard.mk
+++ b/discard.mk
@@ -1190,4 +1190,5 @@ tests += \
 	test-libsystemd-sym \
 	test-libudev-sym
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/hwdb/Makefile b/hwdb/Makefile
index b0cd4ba300..6ae983b88d 100644
--- a/hwdb/Makefile
+++ b/hwdb/Makefile
@@ -33,4 +33,5 @@ hwdb-update:
 	wget -O ma-small.txt 'http://standards.ieee.org/develop/regauth/oui36/oui36.txt' && \
 	./ids-update.pl )
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/ac-power/Makefile b/src/ac-power/Makefile
index b06af09332..9fd451c65c 100644
--- a/src/ac-power/Makefile
+++ b/src/ac-power/Makefile
@@ -29,4 +29,5 @@ systemd_ac_power_SOURCES = \
 systemd_ac_power_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/boot/Makefile b/src/boot/Makefile
index cce11f7208..9e6c221cb6 100644
--- a/src/boot/Makefile
+++ b/src/boot/Makefile
@@ -51,4 +51,5 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_bootctl
 endif
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/boot/efi/Makefile b/src/boot/efi/Makefile
index 9b86554977..321de4ae90 100644
--- a/src/boot/efi/Makefile
+++ b/src/boot/efi/Makefile
@@ -125,4 +125,5 @@ test-efi: test-efi-disk.img
 
 EXTRA_DIST += test/test-efi-create-disk.sh
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/bus-proxyd/Makefile b/src/bus-proxyd/Makefile
index fb8e2826f6..0db5648f70 100644
--- a/src/bus-proxyd/Makefile
+++ b/src/bus-proxyd/Makefile
@@ -76,4 +76,5 @@ bus-proxyd-set-cap-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
 endif
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/coredump/Makefile b/src/coredump/Makefile
index 5d7cd67de0..8a4892595b 100644
--- a/src/coredump/Makefile
+++ b/src/coredump/Makefile
@@ -93,4 +93,5 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.conf.in \
 	units/systemd-coredump@.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/dbus1-generator/Makefile b/src/dbus1-generator/Makefile
index 1d7f0d1a81..0ca31fd24b 100644
--- a/src/dbus1-generator/Makefile
+++ b/src/dbus1-generator/Makefile
@@ -46,4 +46,5 @@ dist_xinitrc_SCRIPTS = \
 INSTALL_EXEC_HOOKS += dbus1-generator-install-hook
 UNINSTALL_EXEC_HOOKS += dbus1-generator-uninstall-hook
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/debug-generator/Makefile b/src/debug-generator/Makefile
index 79684a8a7a..e86085ca7b 100644
--- a/src/debug-generator/Makefile
+++ b/src/debug-generator/Makefile
@@ -29,4 +29,5 @@ systemd_debug_generator_SOURCES = \
 systemd_debug_generator_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/detect-virt/Makefile b/src/detect-virt/Makefile
index 529a3a2561..4b44544c63 100644
--- a/src/detect-virt/Makefile
+++ b/src/detect-virt/Makefile
@@ -32,4 +32,5 @@ systemd_detect_virt_LDADD = \
 INSTALL_EXEC_HOOKS += \
 	systemd-detect-virt-install-hook
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/firstboot/Makefile b/src/firstboot/Makefile
index 97f06890c5..19d6c06c9f 100644
--- a/src/firstboot/Makefile
+++ b/src/firstboot/Makefile
@@ -44,4 +44,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/fsck/Makefile b/src/fsck/Makefile
index 9c981837f5..2e040bfb0e 100644
--- a/src/fsck/Makefile
+++ b/src/fsck/Makefile
@@ -29,4 +29,5 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/fstab-generator/Makefile b/src/fstab-generator/Makefile
index 4d201612b8..6a65d25154 100644
--- a/src/fstab-generator/Makefile
+++ b/src/fstab-generator/Makefile
@@ -30,4 +30,5 @@ systemd_fstab_generator_SOURCES = \
 systemd_fstab_generator_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/getty-generator/Makefile b/src/getty-generator/Makefile
index a070f1c424..84564079bb 100644
--- a/src/getty-generator/Makefile
+++ b/src/getty-generator/Makefile
@@ -29,4 +29,5 @@ systemd_getty_generator_SOURCES = \
 systemd_getty_generator_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/gpt-auto-generator/Makefile b/src/gpt-auto-generator/Makefile
index 1c82e8fae8..6b5c028aaf 100644
--- a/src/gpt-auto-generator/Makefile
+++ b/src/gpt-auto-generator/Makefile
@@ -40,4 +40,5 @@ systemd_gpt_auto_generator_CFLAGS = \
 	$(BLKID_CFLAGS)
 endif
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/hibernate-resume/Makefile b/src/hibernate-resume/Makefile
index 70f7ec7cca..93ac163f95 100644
--- a/src/hibernate-resume/Makefile
+++ b/src/hibernate-resume/Makefile
@@ -57,4 +57,5 @@ EXTRA_DIST += \
 	units/systemd-hibernate-resume@.service.in \
 	units/systemd-hybrid-sleep.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/hostname/Makefile b/src/hostname/Makefile
index 12b0628cb4..9f4b17e94e 100644
--- a/src/hostname/Makefile
+++ b/src/hostname/Makefile
@@ -76,4 +76,5 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-hostnamed.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/import/Makefile b/src/import/Makefile
index aefe6d615b..d602eb8325 100644
--- a/src/import/Makefile
+++ b/src/import/Makefile
@@ -188,4 +188,5 @@ EXTRA_DIST += \
 	units/systemd-importd.service.in
 
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/initctl/Makefile b/src/initctl/Makefile
index b63a2e47d9..05349ba24f 100644
--- a/src/initctl/Makefile
+++ b/src/initctl/Makefile
@@ -29,4 +29,5 @@ systemd_initctl_SOURCES = \
 systemd_initctl_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/journal-remote/Makefile b/src/journal-remote/Makefile
index 302f326303..f67a33530b 100644
--- a/src/journal-remote/Makefile
+++ b/src/journal-remote/Makefile
@@ -110,4 +110,5 @@ EXTRA_DIST += \
 	units/systemd-journal-upload.service.in \
 	src/journal-remote/journal-upload.conf.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/journal/Makefile b/src/journal/Makefile
index de004d78e9..a24dcf3d55 100644
--- a/src/journal/Makefile
+++ b/src/journal/Makefile
@@ -358,4 +358,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-journal-gatewayd.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/kernel-install/Makefile b/src/kernel-install/Makefile
index d50b684d01..f0d39fd1e5 100644
--- a/src/kernel-install/Makefile
+++ b/src/kernel-install/Makefile
@@ -30,4 +30,5 @@ dist_kernelinstall_SCRIPTS = \
 	src/kernel-install/50-depmod.install \
 	src/kernel-install/90-loaderentry.install
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index 5eef67be3d..e7e5ab6904 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -169,4 +169,5 @@ $(outdir)/load-fragment-gperf-nulstr.c: src/core/load-fragment-gperf.gperf
 	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN{ keywords=0 ; FS="," ; print "extern const char load_fragment_gperf_nulstr[];" ; print "const char load_fragment_gperf_nulstr[] ="} ; keyword==1 { print "\"" $$1 "\\0\"" } ; /%%/ { keyword=1} ; END { print ";" }' < $< > $@
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
index aeeb191c33..56b91d8197 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -33,4 +33,5 @@ $(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS)
 
 endif
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 3c260f5ae6..eb155c1ed9 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -137,6 +137,7 @@ libshared_la_LIBADD = \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
+$(eval $(value automake2autothing))
 std.out_files += libshared.la
 CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include
 CPPFLAGS += -I$(topoutdir)/src/libsystemd/include
@@ -147,6 +148,4 @@ CPPFLAGS += -DPOLKIT_AGENT_BINARY_PATH=\"$(bindir)/pkttyagent\" \
 $(outdir)/libshared.la: \
 	$(patsubst src/shared/%.c,$(outdir)/%.lo,$(filter %.c,$(libshared_la_SOURCES)))
 
-$(call amtarget2dir,src/shared,libshared.la)
-
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile
index 45f782b184..3ca5e10caf 100644
--- a/src/libsystemd-network/Makefile
+++ b/src/libsystemd-network/Makefile
@@ -177,4 +177,5 @@ tests += \
 	test-dhcp6-client \
 	test-lldp
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 50de17357f..b5e6e44523 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -282,4 +282,5 @@ nodist_test_libsystemd_sym_SOURCES = \
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile
index 9ac9d1b560..44c4755d36 100644
--- a/src/libsystemd/compat-libs/Makefile
+++ b/src/libsystemd/compat-libs/Makefile
@@ -143,4 +143,5 @@ EXTRA_DIST += \
 	src/compat-libs/libsystemd-id128.pc.in \
 	src/compat-libs/libsystemd-daemon.pc.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index c85835a94d..38115c9108 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -120,6 +120,7 @@ libsystemd_internal_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
+$(eval $(value automake2autothing))
 std.out_files += libsystemd-internal.la
 CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS)
 CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index 4e1f7327ae..09677d6e5e 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -94,4 +94,5 @@ endif
 
 noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index eb08762ae5..fb53230e1b 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -36,4 +36,5 @@ test_libudev_sym_CFLAGS = \
 test_libudev_sym_LDADD = \
 	libudev.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 42e6357e35..d802aeb490 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -78,4 +78,5 @@ noinst_LTLIBRARIES += \
 libudev_internal_la_SOURCES =\
 	$(libudev_la_SOURCES)
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/locale/Makefile b/src/locale/Makefile
index 0e6746dbdb..cc85aa4572 100644
--- a/src/locale/Makefile
+++ b/src/locale/Makefile
@@ -87,4 +87,5 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-localed.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/login/Makefile b/src/login/Makefile
index 5923401112..8b27584ec8 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -240,4 +240,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-user-sessions.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/machine-id-setup/Makefile b/src/machine-id-setup/Makefile
index 125471d17a..b3f1e6f8a8 100644
--- a/src/machine-id-setup/Makefile
+++ b/src/machine-id-setup/Makefile
@@ -34,4 +34,5 @@ systemd_machine_id_setup_LDADD = \
 SYSINIT_TARGET_WANTS += \
 	systemd-machine-id-commit.service
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/machine/src/Makefile b/src/machine/src/Makefile
index 43a799440d..c38b0fe635 100644
--- a/src/machine/src/Makefile
+++ b/src/machine/src/Makefile
@@ -125,4 +125,5 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/modules-load/Makefile b/src/modules-load/Makefile
index f3860d89af..50efc76b09 100644
--- a/src/modules-load/Makefile
+++ b/src/modules-load/Makefile
@@ -57,4 +57,5 @@ EXTRA_DIST += \
 	units/systemd-modules-load.service.in \
 	units/kmod-static-nodes.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/network/Makefile b/src/network/Makefile
index 3baa0d22b4..803bc3b400 100644
--- a/src/network/Makefile
+++ b/src/network/Makefile
@@ -197,4 +197,5 @@ EXTRA_DIST += \
 	units/systemd-networkd-wait-online.service.in \
 	test/networkd-test.py
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
index 57860590c6..54bfc36744 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -44,4 +44,5 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/rc-local-generator/Makefile b/src/rc-local-generator/Makefile
index 2e9b3e7a64..f1673644d4 100644
--- a/src/rc-local-generator/Makefile
+++ b/src/rc-local-generator/Makefile
@@ -29,4 +29,5 @@ systemd_rc_local_generator_SOURCES = \
 systemd_rc_local_generator_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/resolve/src/Makefile b/src/resolve/src/Makefile
index 6f62e7b086..1a882e5161 100644
--- a/src/resolve/src/Makefile
+++ b/src/resolve/src/Makefile
@@ -205,4 +205,5 @@ EXTRA_DIST += \
 	units/systemd-resolved.service.m4.in \
 	src/resolve/resolved.conf.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sleep/Makefile b/src/sleep/Makefile
index 2d8854bbf9..b88418c3fb 100644
--- a/src/sleep/Makefile
+++ b/src/sleep/Makefile
@@ -29,4 +29,5 @@ systemd_sleep_SOURCES = \
 systemd_sleep_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/socket-proxy/Makefile b/src/socket-proxy/Makefile
index cead4f37a9..b2e6ba4f7a 100644
--- a/src/socket-proxy/Makefile
+++ b/src/socket-proxy/Makefile
@@ -30,4 +30,5 @@ systemd_socket_proxyd_SOURCES = \
 systemd_socket_proxyd_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sysctl/Makefile b/src/sysctl/Makefile
index 31d38d9104..b35c3d997a 100644
--- a/src/sysctl/Makefile
+++ b/src/sysctl/Makefile
@@ -29,4 +29,5 @@ systemd_sysctl_SOURCES = \
 systemd_sysctl_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/system-update-generator/Makefile b/src/system-update-generator/Makefile
index 62f750c182..e2ae889d7e 100644
--- a/src/system-update-generator/Makefile
+++ b/src/system-update-generator/Makefile
@@ -29,4 +29,5 @@ systemd_system_update_generator_SOURCES = \
 systemd_system_update_generator_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/system/systemctl/Makefile b/src/system/systemctl/Makefile
index 5cb8c922d9..a83c552a06 100644
--- a/src/system/systemctl/Makefile
+++ b/src/system/systemctl/Makefile
@@ -29,4 +29,5 @@ systemctl_SOURCES = \
 systemctl_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/system/systemd/Makefile b/src/system/systemd/Makefile
index 8abfa2bf9d..e77395c7cf 100644
--- a/src/system/systemd/Makefile
+++ b/src/system/systemd/Makefile
@@ -64,4 +64,5 @@ dist_systemunit_DATA_busnames += \
 BUSNAMES_TARGET_WANTS += \
 	org.freedesktop.systemd1.busname
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile
index 133622ffb0..938c7d2499 100644
--- a/src/systemd-activate/Makefile
+++ b/src/systemd-activate/Makefile
@@ -33,4 +33,5 @@ systemd_activate_SOURCES = \
 systemd_activate_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-analyze/Makefile b/src/systemd-analyze/Makefile
index c8a3d805fd..b39ba721f6 100644
--- a/src/systemd-analyze/Makefile
+++ b/src/systemd-analyze/Makefile
@@ -36,4 +36,5 @@ systemd_analyze_CFLAGS = \
 systemd_analyze_LDADD = \
 	libcore.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-ask-password/Makefile b/src/systemd-ask-password/Makefile
index 11f3c8038a..51d88d4c09 100644
--- a/src/systemd-ask-password/Makefile
+++ b/src/systemd-ask-password/Makefile
@@ -29,4 +29,5 @@ systemd_ask_password_SOURCES = \
 systemd_ask_password_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-backlight/Makefile b/src/systemd-backlight/Makefile
index 7ed3b0a64c..cf61f8f477 100644
--- a/src/systemd-backlight/Makefile
+++ b/src/systemd-backlight/Makefile
@@ -40,4 +40,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-backlight@.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-binfmt/Makefile b/src/systemd-binfmt/Makefile
index 45a3d5056d..a465a1dc7f 100644
--- a/src/systemd-binfmt/Makefile
+++ b/src/systemd-binfmt/Makefile
@@ -53,4 +53,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-binfmt.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-bootchart/Makefile b/src/systemd-bootchart/Makefile
index 91a06ed1a2..79ee43bbb9 100644
--- a/src/systemd-bootchart/Makefile
+++ b/src/systemd-bootchart/Makefile
@@ -48,4 +48,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-bootchart.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile
index 72f43638b1..6d8bafb838 100644
--- a/src/systemd-cgls/Makefile
+++ b/src/systemd-cgls/Makefile
@@ -29,4 +29,5 @@ systemd_cgls_SOURCES = \
 systemd_cgls_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgroups-agent/Makefile b/src/systemd-cgroups-agent/Makefile
index 5c7d9d03ab..3462dcb74c 100644
--- a/src/systemd-cgroups-agent/Makefile
+++ b/src/systemd-cgroups-agent/Makefile
@@ -29,4 +29,5 @@ systemd_cgroups_agent_SOURCES = \
 systemd_cgroups_agent_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgtop/Makefile b/src/systemd-cgtop/Makefile
index 5e379895a8..92e7bd2dc3 100644
--- a/src/systemd-cgtop/Makefile
+++ b/src/systemd-cgtop/Makefile
@@ -29,4 +29,5 @@ systemd_cgtop_SOURCES = \
 systemd_cgtop_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile
index c97df5f959..2287f347b9 100644
--- a/src/systemd-cryptsetup/Makefile
+++ b/src/systemd-cryptsetup/Makefile
@@ -56,4 +56,5 @@ SYSINIT_TARGET_WANTS += \
 
 endif
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile
index b9124f86ea..63ad09d508 100644
--- a/src/systemd-delta/Makefile
+++ b/src/systemd-delta/Makefile
@@ -29,4 +29,5 @@ systemd_delta_SOURCES = \
 systemd_delta_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-escape/Makefile b/src/systemd-escape/Makefile
index 6589e06525..d0614c0713 100644
--- a/src/systemd-escape/Makefile
+++ b/src/systemd-escape/Makefile
@@ -29,4 +29,5 @@ systemd_escape_SOURCES = \
 systemd_escape_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile
index c5402385b9..3de5087a14 100644
--- a/src/systemd-notify/Makefile
+++ b/src/systemd-notify/Makefile
@@ -29,4 +29,5 @@ systemd_notify_SOURCES = \
 systemd_notify_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 3455305df8..a8cd4f5d7e 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -78,4 +78,5 @@ endif
 
 $(outdir)/nspawn.o: $(outdir)/loopback-setup.h
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile
index 19eb6bd10a..9009100008 100644
--- a/src/systemd-path/Makefile
+++ b/src/systemd-path/Makefile
@@ -29,4 +29,5 @@ systemd_path_SOURCES = \
 systemd_path_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-quotacheck/Makefile b/src/systemd-quotacheck/Makefile
index 3b90e6efab..8675511274 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/systemd-quotacheck/Makefile
@@ -43,4 +43,5 @@ EXTRA_DIST += \
 nodist_systemunit_DATA += \
 	units/quotaon.service
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-random-seed/Makefile b/src/systemd-random-seed/Makefile
index d4695c8fb4..69b2cf4b8a 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/systemd-random-seed/Makefile
@@ -44,4 +44,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
index 91baa27bf1..e8374d805b 100644
--- a/src/systemd-remount-fs/Makefile
+++ b/src/systemd-remount-fs/Makefile
@@ -31,4 +31,5 @@ systemd_remount_fs_SOURCES = \
 systemd_remount_fs_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-reply-password/Makefile b/src/systemd-reply-password/Makefile
index 30283141aa..cf5923da07 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -29,4 +29,5 @@ systemd_reply_password_SOURCES = \
 systemd_reply_password_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-rfkill/Makefile b/src/systemd-rfkill/Makefile
index 331ecb7130..e2dda8d8e0 100644
--- a/src/systemd-rfkill/Makefile
+++ b/src/systemd-rfkill/Makefile
@@ -43,4 +43,5 @@ endif
 EXTRA_DIST += \
 	units/systemd-rfkill.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-run/Makefile b/src/systemd-run/Makefile
index afa2d0f34c..282ef5168c 100644
--- a/src/systemd-run/Makefile
+++ b/src/systemd-run/Makefile
@@ -29,4 +29,5 @@ systemd_run_SOURCES = \
 systemd_run_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-shutdown/Makefile b/src/systemd-shutdown/Makefile
index 0695f3927d..1cc4c563cc 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -35,4 +35,5 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timedate/Makefile b/src/systemd-timedate/Makefile
index ea9b36efbc..7584e4d0a7 100644
--- a/src/systemd-timedate/Makefile
+++ b/src/systemd-timedate/Makefile
@@ -76,4 +76,5 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile
index a6ad358562..15d5bc1718 100644
--- a/src/systemd-timesync/Makefile
+++ b/src/systemd-timesync/Makefile
@@ -61,4 +61,5 @@ EXTRA_DIST += \
 	units/systemd-timesyncd.service.in \
 	src/timesync/timesyncd.conf.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-tmpfiles/Makefile b/src/systemd-tmpfiles/Makefile
index ffb01ae3d8..88ea973bae 100644
--- a/src/systemd-tmpfiles/Makefile
+++ b/src/systemd-tmpfiles/Makefile
@@ -81,4 +81,5 @@ EXTRA_DIST += \
 	units/systemd-tmpfiles-setup.service.in \
 	units/systemd-tmpfiles-clean.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-tty-ask-password-agent/Makefile b/src/systemd-tty-ask-password-agent/Makefile
index 37b51da33b..81d2ac4fee 100644
--- a/src/systemd-tty-ask-password-agent/Makefile
+++ b/src/systemd-tty-ask-password-agent/Makefile
@@ -29,4 +29,5 @@ systemd_tty_ask_password_agent_SOURCES = \
 systemd_tty_ask_password_agent_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-update-done/Makefile b/src/systemd-update-done/Makefile
index ae592db650..654d6af7c1 100644
--- a/src/systemd-update-done/Makefile
+++ b/src/systemd-update-done/Makefile
@@ -29,4 +29,5 @@ systemd_update_done_SOURCES = \
 systemd_update_done_LDADD = \
 	libshared.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-update-utmp/Makefile b/src/systemd-update-utmp/Makefile
index 182c7534e7..5b9933ec95 100644
--- a/src/systemd-update-utmp/Makefile
+++ b/src/systemd-update-utmp/Makefile
@@ -34,4 +34,5 @@ systemd_update_utmp_LDADD = \
 	libshared.la \
 	$(AUDIT_LIBS)
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-vconsole/Makefile b/src/systemd-vconsole/Makefile
index 987745d298..4c186c1deb 100644
--- a/src/systemd-vconsole/Makefile
+++ b/src/systemd-vconsole/Makefile
@@ -47,4 +47,5 @@ EXTRA_DIST += \
 	src/vconsole/90-vconsole.rules.in \
 	units/systemd-vconsole-setup.service.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sysusers/Makefile b/src/sysusers/Makefile
index 648100e5de..6060eca737 100644
--- a/src/sysusers/Makefile
+++ b/src/sysusers/Makefile
@@ -58,4 +58,5 @@ EXTRA_DIST += \
 	sysusers.d/systemd-remote.conf.m4 \
 	sysusers.d/basic.conf.in
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sysv-generator/Makefile b/src/sysv-generator/Makefile
index f6de146408..417cb7d849 100644
--- a/src/sysv-generator/Makefile
+++ b/src/sysv-generator/Makefile
@@ -29,4 +29,5 @@ systemd_sysv_generator_SOURCES = \
 systemd_sysv_generator_LDADD = \
 	libcore.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/test/Makefile b/src/test/Makefile
index f416b4aadf..eb65bdce1e 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -32,4 +32,5 @@ test_id128_LDADD = \
 tests += \
 	test-id128
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/Makefile b/src/udev/Makefile
index 22fe5075cf..664afb9568 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -284,4 +284,5 @@ EXTRA_DIST += \
 	test/sysv-generator-test.py \
 	test/mocks/fsck
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/ata_id/Makefile b/src/udev/ata_id/Makefile
index e70e2573bd..639e3da118 100644
--- a/src/udev/ata_id/Makefile
+++ b/src/udev/ata_id/Makefile
@@ -32,4 +32,5 @@ ata_id_LDADD = \
 udevlibexec_PROGRAMS += \
 	ata_id
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/cdrom_id/Makefile b/src/udev/cdrom_id/Makefile
index f7583cfb70..5e9049ad61 100644
--- a/src/udev/cdrom_id/Makefile
+++ b/src/udev/cdrom_id/Makefile
@@ -35,4 +35,5 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-cdrom_id.rules
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/collect/Makefile b/src/udev/collect/Makefile
index 88dbaa1d82..4dacf044f0 100644
--- a/src/udev/collect/Makefile
+++ b/src/udev/collect/Makefile
@@ -32,4 +32,5 @@ collect_LDADD = \
 udevlibexec_PROGRAMS += \
 	collect
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/mtd_probe/Makefile b/src/udev/mtd_probe/Makefile
index 719993ed0f..1c57404e70 100644
--- a/src/udev/mtd_probe/Makefile
+++ b/src/udev/mtd_probe/Makefile
@@ -34,4 +34,5 @@ dist_udevrules_DATA += \
 udevlibexec_PROGRAMS += \
 	mtd_probe
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/scsi_id/Makefile b/src/udev/scsi_id/Makefile
index eaf5a51734..9cc633363a 100644
--- a/src/udev/scsi_id/Makefile
+++ b/src/udev/scsi_id/Makefile
@@ -38,4 +38,5 @@ udevlibexec_PROGRAMS += \
 EXTRA_DIST += \
 	src/udev/scsi_id/README
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/udev/v4l_id/Makefile b/src/udev/v4l_id/Makefile
index c2815b6809..6c9b24a5e1 100644
--- a/src/udev/v4l_id/Makefile
+++ b/src/udev/v4l_id/Makefile
@@ -35,4 +35,5 @@ udevlibexec_PROGRAMS += \
 dist_udevrules_DATA += \
 	rules/60-persistent-v4l.rules
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/test/Makefile b/test/Makefile
index 2b00cff7f7..0fa680e646 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -846,4 +846,5 @@ test_arphrd_list_SOURCES = \
 test_arphrd_list_LDADD = \
 	libbasic.la
 
+$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk