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

4 files changed, 3 insertions, 9 deletions

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