Merge branch 'lukeshu/postmove' into lukeshu/master

# Conflicts: # build-aux/Makefile.each.tail/20-systemd.mk # build-aux/Makefile.once.head/20-systemd.mk # build-aux/Makefile.once.tail/20-systemd.mk # config.mk.in # src/busctl/Makefile # src/grp-boot/bootctl/Makefile # src/grp-boot/systemd-boot/Makefile # src/grp-coredump/coredumpctl/Makefile # src/grp-coredump/systemd-coredump/Makefile # src/grp-machine/libmachine-core/Makefile # src/grp-machine/nss-mymachines/Makefile # src/libbasic/Makefile # src/libfirewall/Makefile # src/libshared/Makefile # src/libsystemd/Makefile # src/libsystemd/libsystemd-internal/Makefile # src/libsystemd/libsystemd-journal-internal/Makefile # src/libudev/src/Makefile # src/systemd-nspawn/Makefile
author: Luke Shumaker <lukeshu@sbcglobal.net> 2016-06-07 02:50:07 -0400
committer: Luke Shumaker <lukeshu@sbcglobal.net> 2016-06-07 02:50:07 -0400
commit: 590eca26c13f4d704b2fc614e7ef49b600e6b5e0 (patch)
tree: 0ce57d70ead69a55809c631d605d4fd2b6c853ef
parent: d10902f55ae7aed2eeffedcd29d8ced80ec903ba (diff)
parent: f0c56a8635949d284e6fb61e04d07e9a8e2b429b (diff)
97 files changed, 10 insertions, 101 deletions
diff --git a/Makefile.am b/Makefile.am
index f009885501..d381cfcdbf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6547,5 +6547,4 @@ 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 6020ded725..5854d519f3 100644
--- a/discard.mk
+++ b/discard.mk
@@ -1153,5 +1153,4 @@ 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 6ae983b88d..b0cd4ba300 100644
--- a/hwdb/Makefile
+++ b/hwdb/Makefile
@@ -33,5 +33,4 @@ 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/move.sh b/move.sh
index fc2b2681fd..bbcfe05384 100755
--- a/move.sh
+++ b/move.sh
@@ -133,6 +133,7 @@ move_files() (
 	mkdir src/grp-boot
 	mv -T src/boot/efi src/grp-boot/systemd-boot
 	mv -T src/boot src/grp-boot/bootctl
+	mv -T {test,src/grp-boot/systemd-boot}/test-efi-create-disk.sh
 
 	mkdir build-aux
 	mkdir build-aux/Makefile.{once,each}.{head,tail}
diff --git a/src/busctl/Makefile b/src/busctl/Makefile
index 43b50b6296..a1286f1705 100644
--- a/src/busctl/Makefile
+++ b/src/busctl/Makefile
@@ -34,8 +34,8 @@ busctl_SOURCES = \
 busctl_LDADD = \
 	$(topoutdir)/src/libshared/libshared.la
 
-$(eval $(value automake2autothing))
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile
index 0f927b0564..a02ac0edc1 100644
--- a/src/grp-boot/bootctl/Makefile
+++ b/src/grp-boot/bootctl/Makefile
@@ -52,7 +52,6 @@ dist_zshcompletion_data += \
 endif # HAVE_BLKID
 endif # ENABLE_EFI
 
-$(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libshared
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
diff --git a/src/grp-coredump/coredumpctl/Makefile b/src/grp-coredump/coredumpctl/Makefile
index d1dfc6f0ee..1c3e9c9c30 100644
--- a/src/grp-coredump/coredumpctl/Makefile
+++ b/src/grp-coredump/coredumpctl/Makefile
@@ -38,8 +38,8 @@ dist_bashcompletion_data += \
 dist_zshcompletion_data += \
 	shell-completion/zsh/_coredumpctl
 
-$(eval $(value automake2autothing))
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index dbc39e66c1..50c53d988e 100644
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
@@ -78,10 +78,10 @@ EXTRA_DIST += \
 	sysctl.d/50-coredump.conf.in \
 	units/systemd-coredump@.service.in
 
-$(eval $(value automake2autothing))
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-journal-internal
 systemd.CPPFLAGS += -I$(topsrcdir)/src/journal
 systemd.CPPFLAGS += -DPKGSYSCONFDIR=\"$(pkgsysconfdir)\"
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/libmachine-core/Makefile b/src/grp-machine/libmachine-core/Makefile
index c2b4ea3b50..8c324808ca 100644
--- a/src/grp-machine/libmachine-core/Makefile
+++ b/src/grp-machine/libmachine-core/Makefile
@@ -47,10 +47,10 @@ test_machine_tables_LDADD = \
 tests += \
 	test-machine-tables
 
-$(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
 systemd.CPPFLAGS += $(libshared.CPPFLAGS)
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/machinectl/Makefile b/src/grp-machine/machinectl/Makefile
index e1cb38d8cf..924e2096de 100644
--- a/src/grp-machine/machinectl/Makefile
+++ b/src/grp-machine/machinectl/Makefile
@@ -39,5 +39,4 @@ dist_zshcompletion_data += \
 	shell-completion/zsh/_machinectl \
 	shell-completion/zsh/_sd_machines
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index cd199d39c0..e52c970be3 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -43,8 +43,8 @@ libnss_mymachines_la_LIBADD = \
 lib_LTLIBRARIES += \
 	libnss_mymachines.la
 
-$(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += -I$(topsrcdir)/src/libsystemd/libsystemd-internal/sd-bus
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-machine/systemd-machined/Makefile b/src/grp-machine/systemd-machined/Makefile
index 116b5a479c..7b6f89f907 100644
--- a/src/grp-machine/systemd-machined/Makefile
+++ b/src/grp-machine/systemd-machined/Makefile
@@ -64,5 +64,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-machined.service.in
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 49a995bd75..e899cfd04d 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -205,5 +205,4 @@ 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/grp-system/systemctl/Makefile b/src/grp-system/systemctl/Makefile
index a83c552a06..5cb8c922d9 100644
--- a/src/grp-system/systemctl/Makefile
+++ b/src/grp-system/systemctl/Makefile
@@ -29,5 +29,4 @@ systemctl_SOURCES = \
 systemctl_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index e77395c7cf..8abfa2bf9d 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -64,5 +64,4 @@ 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/grp-timedate/systemd-timedated/Makefile b/src/grp-timedate/systemd-timedated/Makefile
index 0224793a47..38a180bd3a 100644
--- a/src/grp-timedate/systemd-timedated/Makefile
+++ b/src/grp-timedate/systemd-timedated/Makefile
@@ -62,5 +62,4 @@ polkitpolicy_in_files += \
 EXTRA_DIST += \
 	units/systemd-timedated.service.in
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/grp-timedate/timedatectl/Makefile b/src/grp-timedate/timedatectl/Makefile
index c05838c944..1eb47c10b9 100644
--- a/src/grp-timedate/timedatectl/Makefile
+++ b/src/grp-timedate/timedatectl/Makefile
@@ -39,5 +39,4 @@ dist_bashcompletion_data += \
 dist_zshcompletion_data += \
 	shell-completion/zsh/_timedatectl
 endif # ENABLE_TIMEDATED
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/hostname/Makefile b/src/hostname/Makefile
index f0215ee0cc..f601560f0a 100644
--- a/src/hostname/Makefile
+++ b/src/hostname/Makefile
@@ -76,5 +76,4 @@ 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 019350e9bb..909662b1b4 100644
--- a/src/import/Makefile
+++ b/src/import/Makefile
@@ -191,5 +191,4 @@ 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 05349ba24f..b63a2e47d9 100644
--- a/src/initctl/Makefile
+++ b/src/initctl/Makefile
@@ -29,5 +29,4 @@ 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 150e326a78..a95f6ab31a 100644
--- a/src/journal-remote/Makefile
+++ b/src/journal-remote/Makefile
@@ -110,5 +110,4 @@ 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 17f2c5e859..4a7d6122c1 100644
--- a/src/journal/Makefile
+++ b/src/journal/Makefile
@@ -345,5 +345,4 @@ endif # HAVE_MICROHTTPD
 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 f0d39fd1e5..d50b684d01 100644
--- a/src/kernel-install/Makefile
+++ b/src/kernel-install/Makefile
@@ -30,5 +30,4 @@ 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/libbasic/Makefile b/src/libbasic/Makefile
index 79ec1b26cc..b01d100a72 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -277,7 +277,6 @@ $(outdir)/cap-from-name.gperf: $(outdir)/cap-list.txt
 $(outdir)/cap-from-name.h: $(outdir)/cap-from-name.gperf
 	$(AM_V_GPERF)$(GPERF) -L ANSI-C -t --ignore-case -N lookup_capability -H hash_capability_name -p -C <$< >$@
 
-$(eval $(value automake2autothing))
 $(outdir)/af-list.lo: $(outdir)/af-from-name.h $(outdir)/af-to-name.h
 $(outdir)/arphrd-list.lo: $(outdir)/arphrd-from-name.h $(outdir)/arphrd-to-name.h
 $(outdir)/cap-list.lo: $(outdir)/cap-from-name.h $(outdir)/cap-to-name.h
diff --git a/src/libbus-proxy-core/Makefile b/src/libbus-proxy-core/Makefile
index 3ac995f31c..f3cf4a055f 100644
--- a/src/libbus-proxy-core/Makefile
+++ b/src/libbus-proxy-core/Makefile
@@ -39,5 +39,4 @@ libbus_proxy_core_la_SOURCES = \
 libbus_proxy_core_la_LIBADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libcore/Makefile b/src/libcore/Makefile
index e7e5ab6904..5eef67be3d 100644
--- a/src/libcore/Makefile
+++ b/src/libcore/Makefile
@@ -169,5 +169,4 @@ $(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 6df4908c21..ebc567cc55 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -39,6 +39,6 @@ libfirewall_la_LIBADD = \
 	$(LIBIPTC_LIBS)
 endif # HAVE_LIBIPTC
 
-$(eval $(value automake2autothing))
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index 9d4a2b4c21..c7e171aaa0 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -145,7 +145,6 @@ test_local_addresses_SOURCES = \
 test_local_addresses_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-internal
 at.depdirs += $(topoutdir)/src/libsystemd/libsystemd-journal-internal
 at.depdirs += $(topoutdir)/src/libudev/src
diff --git a/src/libsystemd-network/Makefile b/src/libsystemd-network/Makefile
index 3ca5e10caf..45f782b184 100644
--- a/src/libsystemd-network/Makefile
+++ b/src/libsystemd-network/Makefile
@@ -177,5 +177,4 @@ 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 47db55a00d..7728d0f911 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -126,11 +126,11 @@ nodist_test_libsystemd_sym_SOURCES = \
 test_libsystemd_sym_LDADD = \
 	libsystemd.la
 
-$(eval $(value automake2autothing))
 $(outdir)/libsystemd.la: $(srcdir)/libsystemd.sym
 $(outdir)/libsystemd.la: $(outdir)/libsystemd-internal/libsystemd-internal.la
 $(outdir)/libsystemd.la: $(outdir)/libsystemd-journal-internal/libsystemd-journal-internal.la
 at.subdirs += libsystemd-internal libsystemd-journal-internal
 systemd.sed_files += libsystemd.pc
 #at.subdirs += compat-libs
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libsystemd/compat-libs/Makefile b/src/libsystemd/compat-libs/Makefile
index eb3787659d..1c2527ae28 100644
--- a/src/libsystemd/compat-libs/Makefile
+++ b/src/libsystemd/compat-libs/Makefile
@@ -143,5 +143,4 @@ 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 5ac7825bd0..d71aa9416d 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -248,12 +248,7 @@ test_resolve_SOURCES = \
 test_resolve_LDADD = \
 	libshared.la
 
-automake_sources = $(patsubst src/libsystemd/%,$(outdir)/%,$(filter %.c,$($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
-$(eval $(value automake2autothing))
-_subdirs := $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la))))
-automake_sources = $(addprefix $(outdir)/,$(notdir $($(automake_name)_SOURCES) $(nodist_$(automake_name)_SOURCES)))
-
-at.subdirs += $(_subdirs)
+at.subdirs += $(notdir $(patsubst %/,%,$(dir $(call automake_sources,libsystemd-internal.la))))
 at.depdirs += $(topoutdir)/src/libbasic
 
 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
diff --git a/src/libsystemd/libsystemd-journal-internal/Makefile b/src/libsystemd/libsystemd-journal-internal/Makefile
index a645ac5cff..7b7f313077 100644
--- a/src/libsystemd/libsystemd-journal-internal/Makefile
+++ b/src/libsystemd/libsystemd-journal-internal/Makefile
@@ -109,8 +109,8 @@ endif # HAVE_GCRYPT
 noinst_LTLIBRARIES += \
 	libsystemd-journal-internal.la
 
-$(eval $(value automake2autothing))
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += -DCATALOG_DATABASE=\"$(catalogstatedir)/database\"
 $(outdir)/audit-type.lo: $(outdir)/audit_type-to-name.h
+
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libudev/src/Makefile b/src/libudev/src/Makefile
index 29651d9311..774245dbdf 100644
--- a/src/libudev/src/Makefile
+++ b/src/libudev/src/Makefile
@@ -74,7 +74,6 @@ test_libudev_sym_CFLAGS = \
 test_libudev_sym_LDADD = \
 	libudev.la
 
-$(eval $(value automake2autothing))
 systemd.sed_files += libudev.pc
 systemd.CPPFLAGS += $(libbasic.CPPFLAGS)
 systemd.CPPFLAGS += $(libsystemd.CPPFLAGS)
diff --git a/src/locale/Makefile b/src/locale/Makefile
index 7ff69e87a9..cda2d17d4c 100644
--- a/src/locale/Makefile
+++ b/src/locale/Makefile
@@ -87,5 +87,4 @@ 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 4f75bc1cdd..85c79a93b6 100644
--- a/src/login/Makefile
+++ b/src/login/Makefile
@@ -240,5 +240,4 @@ endif # HAVE_PAM
 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 b3f1e6f8a8..125471d17a 100644
--- a/src/machine-id-setup/Makefile
+++ b/src/machine-id-setup/Makefile
@@ -34,5 +34,4 @@ 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/modules-load/Makefile b/src/modules-load/Makefile
index 390a2dc4e9..ab334e16e8 100644
--- a/src/modules-load/Makefile
+++ b/src/modules-load/Makefile
@@ -57,5 +57,4 @@ 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 d390da1fc4..3453a9c56d 100644
--- a/src/network/Makefile
+++ b/src/network/Makefile
@@ -197,5 +197,4 @@ 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 1477a13a2c..9af5aeabc2 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -44,5 +44,4 @@ lib_LTLIBRARIES += \
 	libnss_myhostname.la
 endif # HAVE_MYHOSTNAME
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/sleep/Makefile b/src/sleep/Makefile
index b88418c3fb..2d8854bbf9 100644
--- a/src/sleep/Makefile
+++ b/src/sleep/Makefile
@@ -29,5 +29,4 @@ 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 b2e6ba4f7a..cead4f37a9 100644
--- a/src/socket-proxy/Makefile
+++ b/src/socket-proxy/Makefile
@@ -30,5 +30,4 @@ 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 b35c3d997a..31d38d9104 100644
--- a/src/sysctl/Makefile
+++ b/src/sysctl/Makefile
@@ -29,5 +29,4 @@ systemd_sysctl_SOURCES = \
 systemd_sysctl_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-ac-power/Makefile b/src/systemd-ac-power/Makefile
index 9fd451c65c..b06af09332 100644
--- a/src/systemd-ac-power/Makefile
+++ b/src/systemd-ac-power/Makefile
@@ -29,5 +29,4 @@ systemd_ac_power_SOURCES = \
 systemd_ac_power_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-activate/Makefile b/src/systemd-activate/Makefile
index 8659cb1beb..058e10809e 100644
--- a/src/systemd-activate/Makefile
+++ b/src/systemd-activate/Makefile
@@ -33,5 +33,4 @@ 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 b39ba721f6..c8a3d805fd 100644
--- a/src/systemd-analyze/Makefile
+++ b/src/systemd-analyze/Makefile
@@ -36,5 +36,4 @@ 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 51d88d4c09..11f3c8038a 100644
--- a/src/systemd-ask-password/Makefile
+++ b/src/systemd-ask-password/Makefile
@@ -29,5 +29,4 @@ 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 557a236aa9..115285ec40 100644
--- a/src/systemd-backlight/Makefile
+++ b/src/systemd-backlight/Makefile
@@ -40,5 +40,4 @@ endif # ENABLE_BACKLIGHT
 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 54f73bacd1..6f520311e4 100644
--- a/src/systemd-binfmt/Makefile
+++ b/src/systemd-binfmt/Makefile
@@ -53,5 +53,4 @@ endif # ENABLE_BINFMT
 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 e752c988e0..26be9339a9 100644
--- a/src/systemd-bootchart/Makefile
+++ b/src/systemd-bootchart/Makefile
@@ -48,5 +48,4 @@ endif # ENABLE_BOOTCHART
 EXTRA_DIST += \
 	units/systemd-bootchart.service.in
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-bus-proxyd/Makefile b/src/systemd-bus-proxyd/Makefile
index 411106d38e..75e98b1633 100644
--- a/src/systemd-bus-proxyd/Makefile
+++ b/src/systemd-bus-proxyd/Makefile
@@ -53,5 +53,4 @@ bus-proxyd-set-cap-hook:
 INSTALL_EXEC_HOOKS += bus-proxyd-set-cap-hook
 endif # HAVE_SMACK
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-cgls/Makefile b/src/systemd-cgls/Makefile
index 6d8bafb838..72f43638b1 100644
--- a/src/systemd-cgls/Makefile
+++ b/src/systemd-cgls/Makefile
@@ -29,5 +29,4 @@ 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 3462dcb74c..5c7d9d03ab 100644
--- a/src/systemd-cgroups-agent/Makefile
+++ b/src/systemd-cgroups-agent/Makefile
@@ -29,5 +29,4 @@ 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 92e7bd2dc3..5e379895a8 100644
--- a/src/systemd-cgtop/Makefile
+++ b/src/systemd-cgtop/Makefile
@@ -29,5 +29,4 @@ 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 ea731cad5a..7ab3605a31 100644
--- a/src/systemd-cryptsetup/Makefile
+++ b/src/systemd-cryptsetup/Makefile
@@ -56,5 +56,4 @@ SYSINIT_TARGET_WANTS += \
 
 endif # HAVE_LIBCRYPTSETUP
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-dbus1-generator/Makefile b/src/systemd-dbus1-generator/Makefile
index 0ca31fd24b..1d7f0d1a81 100644
--- a/src/systemd-dbus1-generator/Makefile
+++ b/src/systemd-dbus1-generator/Makefile
@@ -46,5 +46,4 @@ 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/systemd-debug-generator/Makefile b/src/systemd-debug-generator/Makefile
index e86085ca7b..79684a8a7a 100644
--- a/src/systemd-debug-generator/Makefile
+++ b/src/systemd-debug-generator/Makefile
@@ -29,5 +29,4 @@ systemd_debug_generator_SOURCES = \
 systemd_debug_generator_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-delta/Makefile b/src/systemd-delta/Makefile
index 63ad09d508..b9124f86ea 100644
--- a/src/systemd-delta/Makefile
+++ b/src/systemd-delta/Makefile
@@ -29,5 +29,4 @@ systemd_delta_SOURCES = \
 systemd_delta_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-detect-virt/Makefile b/src/systemd-detect-virt/Makefile
index 4b44544c63..529a3a2561 100644
--- a/src/systemd-detect-virt/Makefile
+++ b/src/systemd-detect-virt/Makefile
@@ -32,5 +32,4 @@ 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/systemd-escape/Makefile b/src/systemd-escape/Makefile
index d0614c0713..6589e06525 100644
--- a/src/systemd-escape/Makefile
+++ b/src/systemd-escape/Makefile
@@ -29,5 +29,4 @@ systemd_escape_SOURCES = \
 systemd_escape_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-firstboot/Makefile b/src/systemd-firstboot/Makefile
index 71dd8b74c3..931cf485e6 100644
--- a/src/systemd-firstboot/Makefile
+++ b/src/systemd-firstboot/Makefile
@@ -44,5 +44,4 @@ endif # ENABLE_FIRSTBOOT
 EXTRA_DIST += \
 	units/systemd-firstboot.service.in
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-fsck/Makefile b/src/systemd-fsck/Makefile
index 2e040bfb0e..9c981837f5 100644
--- a/src/systemd-fsck/Makefile
+++ b/src/systemd-fsck/Makefile
@@ -29,5 +29,4 @@ systemd_fsck_SOURCES = \
 systemd_fsck_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-fstab-generator/Makefile b/src/systemd-fstab-generator/Makefile
index 6a65d25154..4d201612b8 100644
--- a/src/systemd-fstab-generator/Makefile
+++ b/src/systemd-fstab-generator/Makefile
@@ -30,5 +30,4 @@ systemd_fstab_generator_SOURCES = \
 systemd_fstab_generator_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-getty-generator/Makefile b/src/systemd-getty-generator/Makefile
index 84564079bb..a070f1c424 100644
--- a/src/systemd-getty-generator/Makefile
+++ b/src/systemd-getty-generator/Makefile
@@ -29,5 +29,4 @@ systemd_getty_generator_SOURCES = \
 systemd_getty_generator_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile
index 16b5933638..177db8da7c 100644
--- a/src/systemd-gpt-auto-generator/Makefile
+++ b/src/systemd-gpt-auto-generator/Makefile
@@ -40,5 +40,4 @@ systemd_gpt_auto_generator_CFLAGS = \
 	$(BLKID_CFLAGS)
 endif # HAVE_BLKID
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-hibernate-resume/Makefile b/src/systemd-hibernate-resume/Makefile
index 8b204da327..baee443e84 100644
--- a/src/systemd-hibernate-resume/Makefile
+++ b/src/systemd-hibernate-resume/Makefile
@@ -57,5 +57,4 @@ 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/systemd-hwdb/Makefile b/src/systemd-hwdb/Makefile
index 2b3aaeed54..47f900aefc 100644
--- a/src/systemd-hwdb/Makefile
+++ b/src/systemd-hwdb/Makefile
@@ -73,5 +73,4 @@ EXTRA_DIST += \
 	hwdb/ids-update.pl \
 	hwdb/sdio.ids
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-notify/Makefile b/src/systemd-notify/Makefile
index 3de5087a14..c5402385b9 100644
--- a/src/systemd-notify/Makefile
+++ b/src/systemd-notify/Makefile
@@ -29,5 +29,4 @@ 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 778afb8dc8..0cb85bb82d 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -67,7 +67,6 @@ systemd_nspawn_LDADD += \
 endif # HAVE_LIBIPTC
 
 bin_PROGRAMS += systemd-nspawn
-$(eval $(value automake2autothing))
 at.depdirs += $(topoutdir)/src/libshared $(if $(HAVE_LIBIPTC),$(topoutdir)/src/libfirewall)
 systemd.CPPFLAGS += $(libshared.CPPFLAGS) $(if $(HAVE_LIBIPTC),$(libfirewall.CPPFLAGS))
 
diff --git a/src/systemd-path/Makefile b/src/systemd-path/Makefile
index 9009100008..19eb6bd10a 100644
--- a/src/systemd-path/Makefile
+++ b/src/systemd-path/Makefile
@@ -29,5 +29,4 @@ 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 435ed0438c..42ff1dc814 100644
--- a/src/systemd-quotacheck/Makefile
+++ b/src/systemd-quotacheck/Makefile
@@ -43,5 +43,4 @@ 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 80f122dd73..d32f124c9a 100644
--- a/src/systemd-random-seed/Makefile
+++ b/src/systemd-random-seed/Makefile
@@ -44,5 +44,4 @@ endif # ENABLE_RANDOMSEED
 EXTRA_DIST += \
 	units/systemd-random-seed.service.in
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-rc-local-generator/Makefile b/src/systemd-rc-local-generator/Makefile
index f1673644d4..2e9b3e7a64 100644
--- a/src/systemd-rc-local-generator/Makefile
+++ b/src/systemd-rc-local-generator/Makefile
@@ -29,5 +29,4 @@ 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/systemd-remount-fs/Makefile b/src/systemd-remount-fs/Makefile
index e8374d805b..91baa27bf1 100644
--- a/src/systemd-remount-fs/Makefile
+++ b/src/systemd-remount-fs/Makefile
@@ -31,5 +31,4 @@ 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 cf5923da07..30283141aa 100644
--- a/src/systemd-reply-password/Makefile
+++ b/src/systemd-reply-password/Makefile
@@ -29,5 +29,4 @@ 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 c8eaf043c9..4cb5137e63 100644
--- a/src/systemd-rfkill/Makefile
+++ b/src/systemd-rfkill/Makefile
@@ -43,5 +43,4 @@ endif # ENABLE_RFKILL
 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 282ef5168c..afa2d0f34c 100644
--- a/src/systemd-run/Makefile
+++ b/src/systemd-run/Makefile
@@ -29,5 +29,4 @@ 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 1cc4c563cc..0695f3927d 100644
--- a/src/systemd-shutdown/Makefile
+++ b/src/systemd-shutdown/Makefile
@@ -35,5 +35,4 @@ systemd_shutdown_SOURCES = \
 systemd_shutdown_LDADD = \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-stdio-bridge/Makefile b/src/systemd-stdio-bridge/Makefile
index 24852e78ed..650240a908 100644
--- a/src/systemd-stdio-bridge/Makefile
+++ b/src/systemd-stdio-bridge/Makefile
@@ -30,5 +30,4 @@ systemd_stdio_bridge_LDADD = \
 	libbus-proxy-core.la \
 	libshared.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-system-update-generator/Makefile b/src/systemd-system-update-generator/Makefile
index e2ae889d7e..62f750c182 100644
--- a/src/systemd-system-update-generator/Makefile
+++ b/src/systemd-system-update-generator/Makefile
@@ -29,5 +29,4 @@ 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/systemd-sysv-generator/Makefile b/src/systemd-sysv-generator/Makefile
index 417cb7d849..f6de146408 100644
--- a/src/systemd-sysv-generator/Makefile
+++ b/src/systemd-sysv-generator/Makefile
@@ -29,5 +29,4 @@ systemd_sysv_generator_SOURCES = \
 systemd_sysv_generator_LDADD = \
 	libcore.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/systemd-timesync/Makefile b/src/systemd-timesync/Makefile
index 26d96ca1e0..a329865019 100644
--- a/src/systemd-timesync/Makefile
+++ b/src/systemd-timesync/Makefile
@@ -61,5 +61,4 @@ 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 cd4778b4b5..c193b9c37d 100644
--- a/src/systemd-tmpfiles/Makefile
+++ b/src/systemd-tmpfiles/Makefile
@@ -81,5 +81,4 @@ 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 81d2ac4fee..37b51da33b 100644
--- a/src/systemd-tty-ask-password-agent/Makefile
+++ b/src/systemd-tty-ask-password-agent/Makefile
@@ -29,5 +29,4 @@ 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 654d6af7c1..ae592db650 100644
--- a/src/systemd-update-done/Makefile
+++ b/src/systemd-update-done/Makefile
@@ -29,5 +29,4 @@ 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 5b9933ec95..182c7534e7 100644
--- a/src/systemd-update-utmp/Makefile
+++ b/src/systemd-update-utmp/Makefile
@@ -34,5 +34,4 @@ 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 9cfaaa5fba..466829c1b9 100644
--- a/src/systemd-vconsole/Makefile
+++ b/src/systemd-vconsole/Makefile
@@ -47,5 +47,4 @@ 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 83f497dfac..c9aaad0369 100644
--- a/src/sysusers/Makefile
+++ b/src/sysusers/Makefile
@@ -58,5 +58,4 @@ 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/test/Makefile b/src/test/Makefile
index eb65bdce1e..f416b4aadf 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -32,5 +32,4 @@ 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 b355ac8726..4e475a5727 100644
--- a/src/udev/Makefile
+++ b/src/udev/Makefile
@@ -177,5 +177,4 @@ udevadm_SOURCES = \
 udevadm_LDADD = \
 	libudev-core.la
 
-$(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 639e3da118..e70e2573bd 100644
--- a/src/udev/ata_id/Makefile
+++ b/src/udev/ata_id/Makefile
@@ -32,5 +32,4 @@ 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 5e9049ad61..f7583cfb70 100644
--- a/src/udev/cdrom_id/Makefile
+++ b/src/udev/cdrom_id/Makefile
@@ -35,5 +35,4 @@ 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 4dacf044f0..88dbaa1d82 100644
--- a/src/udev/collect/Makefile
+++ b/src/udev/collect/Makefile
@@ -32,5 +32,4 @@ 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 1c57404e70..719993ed0f 100644
--- a/src/udev/mtd_probe/Makefile
+++ b/src/udev/mtd_probe/Makefile
@@ -34,5 +34,4 @@ 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 9cc633363a..eaf5a51734 100644
--- a/src/udev/scsi_id/Makefile
+++ b/src/udev/scsi_id/Makefile
@@ -38,5 +38,4 @@ 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 6c9b24a5e1..c2815b6809 100644
--- a/src/udev/v4l_id/Makefile
+++ b/src/udev/v4l_id/Makefile
@@ -35,5 +35,4 @@ 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 86068521d6..e95f00818b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -846,5 +846,4 @@ test_arphrd_list_SOURCES = \
 test_arphrd_list_LDADD = \
 	libbasic.la
 
-$(eval $(value automake2autothing))
 include $(topsrcdir)/build-aux/Makefile.tail.mk
author	Luke Shumaker <lukeshu@sbcglobal.net>	2016-06-07 02:50:07 -0400
committer	Luke Shumaker <lukeshu@sbcglobal.net>	2016-06-07 02:50:07 -0400
commit	590eca26c13f4d704b2fc614e7ef49b600e6b5e0 (patch)
tree	0ce57d70ead69a55809c631d605d4fd2b6c853ef
parent	d10902f55ae7aed2eeffedcd29d8ced80ec903ba (diff)
parent	f0c56a8635949d284e6fb61e04d07e9a8e2b429b (diff)