Merge branch 'notsystemd/postmove' into notsystemd/master

# Conflicts:
#	build-aux/Makefile.each.tail/50-sd.mk
#	build-aux/Makefile.each.tail/70-man.mk
#	src/grp-resolve/libbasic-dns/Makefile
#	src/grp-system/libcore/Makefile
#	tools/notsd-move

42 files changed, 2 insertions, 76 deletions

diff --git a/discard.mk b/discard.mk
index 2faba126ce..ffd9830d83 100644
--- a/discard.mk
+++ b/discard.mk
@@ -718,7 +718,6 @@ endif # ENABLE_TESTS
 # packed sysfs test tree
 $(outdir)/sys: test/sys.tar.xz
 	-rm -rf test/sys
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 	-touch test/sys
 
@@ -819,20 +818,16 @@ $(outdir)/%: shell-completion/%.in
 	$(SED_PROCESS)
 
 $(outdir)/%: sysusers.d/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 $(outdir)/%: tmpfiles.d/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) < $< > $@
 
 
 $(outdir)/%: units/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_SYSTEM=1 < $< > $@
 
 $(outdir)/%: units/user/%.m4 $(top_builddir)/config.status
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_M4)$(M4) -P $(M4_DEFINES) -DFOR_USER=1 < $< > $@
 
 ifneq ($(ENABLE_POLKIT),)
diff --git a/src/grp-boot/bootctl/Makefile b/src/grp-boot/bootctl/Makefile
index 5533e677a1..90bbed9fad 100644
--- a/src/grp-boot/bootctl/Makefile
+++ b/src/grp-boot/bootctl/Makefile
@@ -29,12 +29,10 @@ bootctl_SOURCES = \
 	src/boot/bootctl.c
 
 bootctl_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
 	-DEFI_MACHINE_TYPE_NAME=\"$(EFI_MACHINE_TYPE_NAME)\" \
 	-DBOOTLIBDIR=\"$(bootlibdir)\"
 
 bootctl_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS)
 
 bootctl_LDADD = \
diff --git a/src/grp-coredump/systemd-coredump/Makefile b/src/grp-coredump/systemd-coredump/Makefile
index f294760802..edc6a0c054 100644
--- a/src/grp-coredump/systemd-coredump/Makefile
+++ b/src/grp-coredump/systemd-coredump/Makefile
@@ -30,7 +30,6 @@ systemd_coredump_SOURCES = \
 	src/coredump/coredump-vacuum.h
 
 systemd_coredump_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(ACL_CFLAGS)
 
 systemd_coredump_LDADD = \
diff --git a/src/grp-initprogs/systemd-modules-load/Makefile b/src/grp-initprogs/systemd-modules-load/Makefile
index 9ed48c3ce4..01ee557164 100644
--- a/src/grp-initprogs/systemd-modules-load/Makefile
+++ b/src/grp-initprogs/systemd-modules-load/Makefile
@@ -28,7 +28,6 @@ systemd_modules_load_SOURCES = \
 	src/modules-load/modules-load.c
 
 systemd_modules_load_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(KMOD_CFLAGS)
 
 systemd_modules_load_LDADD = \
diff --git a/src/grp-initprogs/systemd-tmpfiles/Makefile b/src/grp-initprogs/systemd-tmpfiles/Makefile
index e71280f226..8e114070b3 100644
--- a/src/grp-initprogs/systemd-tmpfiles/Makefile
+++ b/src/grp-initprogs/systemd-tmpfiles/Makefile
@@ -28,7 +28,6 @@ systemd_tmpfiles_SOURCES = \
 	src/tmpfiles/tmpfiles.c
 
 systemd_tmpfiles_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(ACL_CFLAGS)
 
 systemd_tmpfiles_LDADD = \
diff --git a/src/grp-initprogs/systemd-update-utmp/Makefile b/src/grp-initprogs/systemd-update-utmp/Makefile
index 516af17a22..506e4840a5 100644
--- a/src/grp-initprogs/systemd-update-utmp/Makefile
+++ b/src/grp-initprogs/systemd-update-utmp/Makefile
@@ -32,7 +32,6 @@ systemd_update_utmp_SOURCES = \
 	src/update-utmp/update-utmp.c
 
 systemd_update_utmp_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(AUDIT_CFLAGS)
 
 systemd_update_utmp_LDADD = \
diff --git a/src/grp-journal/Makefile b/src/grp-journal/Makefile
index d0b2bf1917..acd4b7a0a1 100644
--- a/src/grp-journal/Makefile
+++ b/src/grp-journal/Makefile
@@ -93,7 +93,6 @@ test_catalog_SOURCES = \
 	src/journal/test-catalog.c
 
 test_catalog_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
 	-DCATALOG_DIR=\"$(abs_top_builddir)/catalog\"
 
 test_catalog_LDADD = \
diff --git a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
index 289228fb71..1daedbd8dd 100644
--- a/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-gatewayd/Makefile
@@ -44,11 +44,9 @@ systemd_journal_gatewayd_LDADD += \
 endif # HAVE_GNUTLS
 
 systemd_journal_gatewayd_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(MICROHTTPD_CFLAGS)
 
 systemd_journal_gatewayd_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
 	-DDOCUMENT_ROOT=\"$(gatewayddocumentrootdir)\"
 
 dist_systemunit_DATA += \
diff --git a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
index 45ed4abb63..ebfa101c97 100644
--- a/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-remote/Makefile
@@ -43,7 +43,6 @@ systemd_journal_remote_SOURCES += \
 	src/journal-remote/microhttpd-util.c
 
 systemd_journal_remote_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(MICROHTTPD_CFLAGS)
 
 systemd_journal_remote_LDADD += \
diff --git a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
index c2d1f42cc9..acfcbd22df 100644
--- a/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
+++ b/src/grp-journal/grp-remote/systemd-journal-upload/Makefile
@@ -33,7 +33,6 @@ systemd_journal_upload_SOURCES = \
         src/journal-remote/journal-upload-journal.c
 
 systemd_journal_upload_CFLAGS = \
-        $(AM_CFLAGS) \
         $(LIBCURL_CFLAGS)
 
 systemd_journal_upload_LDADD = \
diff --git a/src/grp-journal/journalctl/Makefile b/src/grp-journal/journalctl/Makefile
index bf5a4d3924..11cfe17107 100644
--- a/src/grp-journal/journalctl/Makefile
+++ b/src/grp-journal/journalctl/Makefile
@@ -25,7 +25,6 @@ include $(topsrcdir)/build-aux/Makefile.head.mk
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 journalctl_CFLAGS = \
-	$(AM_CFLAGS)
 
 journalctl_SOURCES = \
 	src/journal/journalctl.c
diff --git a/src/grp-locale/systemd-localed/Makefile b/src/grp-locale/systemd-localed/Makefile
index e353bad200..8017bcc767 100644
--- a/src/grp-locale/systemd-localed/Makefile
+++ b/src/grp-locale/systemd-localed/Makefile
@@ -34,7 +34,6 @@ systemd_localed_LDADD = \
 	-ldl
 
 systemd_localed_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(XKBCOMMON_CFLAGS)
 
 nodist_systemunit_DATA += \
diff --git a/src/grp-login/pam_systemd/Makefile b/src/grp-login/pam_systemd/Makefile
index 9bb3af70b0..8de05d9b7b 100644
--- a/src/grp-login/pam_systemd/Makefile
+++ b/src/grp-login/pam_systemd/Makefile
@@ -29,11 +29,9 @@ pam_systemd_la_SOURCES = \
 	src/login/pam_systemd.c
 
 pam_systemd_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(PAM_CFLAGS)
 
 pam_systemd_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-module \
 	-export-dynamic \
 	-avoid-version \
diff --git a/src/grp-machine/grp-import/libimport/Makefile b/src/grp-machine/grp-import/libimport/Makefile
index ee10c0f6df..5b15c57715 100644
--- a/src/grp-machine/grp-import/libimport/Makefile
+++ b/src/grp-machine/grp-import/libimport/Makefile
@@ -41,7 +41,6 @@ test_qcow2_SOURCES = \
 	src/import/qcow2-util.h
 
 test_qcow2_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(ZLIB_CFLAGS)
 
 test_qcow2_LDADD = \
diff --git a/src/grp-machine/grp-import/systemd-export/Makefile b/src/grp-machine/grp-import/systemd-export/Makefile
index aa8792565a..f641d93f14 100644
--- a/src/grp-machine/grp-import/systemd-export/Makefile
+++ b/src/grp-machine/grp-import/systemd-export/Makefile
@@ -33,7 +33,6 @@ systemd_export_SOURCES = \
 	src/import/export-raw.h
 
 systemd_export_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(XZ_CFLAGS) \
 	$(ZLIB_CFLAGS) \
 	$(BZIP2_CFLAGS)
diff --git a/src/grp-machine/grp-import/systemd-import/Makefile b/src/grp-machine/grp-import/systemd-import/Makefile
index 221659c346..fe3105914c 100644
--- a/src/grp-machine/grp-import/systemd-import/Makefile
+++ b/src/grp-machine/grp-import/systemd-import/Makefile
@@ -32,7 +32,6 @@ systemd_import_SOURCES = \
 	src/import/import-tar.h
 
 systemd_import_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(XZ_CFLAGS) \
 	$(ZLIB_CFLAGS) \
 	$(BZIP2_CFLAGS)
diff --git a/src/grp-machine/grp-import/systemd-importd/Makefile b/src/grp-machine/grp-import/systemd-importd/Makefile
index e00f531a0d..19705a925e 100644
--- a/src/grp-machine/grp-import/systemd-importd/Makefile
+++ b/src/grp-machine/grp-import/systemd-importd/Makefile
@@ -28,7 +28,6 @@ systemd_importd_SOURCES = \
 	src/import/importd.c
 
 systemd_importd_CFLAGS = \
-	$(AM_CFLAGS) \
 	-D SYSTEMD_PULL_PATH=\"$(rootlibexecdir)/systemd-pull\" \
 	-D SYSTEMD_IMPORT_PATH=\"$(rootlibexecdir)/systemd-import\" \
 	-D SYSTEMD_EXPORT_PATH=\"$(rootlibexecdir)/systemd-export\"
diff --git a/src/grp-machine/grp-import/systemd-pull/Makefile b/src/grp-machine/grp-import/systemd-pull/Makefile
index 780a5a4610..0b593158e4 100644
--- a/src/grp-machine/grp-import/systemd-pull/Makefile
+++ b/src/grp-machine/grp-import/systemd-pull/Makefile
@@ -38,7 +38,6 @@ systemd_pull_SOURCES = \
 	src/import/curl-util.h
 
 systemd_pull_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(LIBCURL_CFLAGS) \
 	$(XZ_CFLAGS) \
 	$(ZLIB_CFLAGS) \
diff --git a/src/grp-machine/nss-mymachines/Makefile b/src/grp-machine/nss-mymachines/Makefile
index bc7f9e791a..54d78ed2f1 100644
--- a/src/grp-machine/nss-mymachines/Makefile
+++ b/src/grp-machine/nss-mymachines/Makefile
@@ -28,7 +28,6 @@ libnss_mymachines_la_SOURCES = \
 	src/nss-mymachines/nss-mymachines.c
 
 libnss_mymachines_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-module \
 	-export-dynamic \
 	-avoid-version \
diff --git a/src/grp-network/libnetworkd-core/Makefile b/src/grp-network/libnetworkd-core/Makefile
index 3821f06c0f..740206413e 100644
--- a/src/grp-network/libnetworkd-core/Makefile
+++ b/src/grp-network/libnetworkd-core/Makefile
@@ -27,7 +27,6 @@ noinst_LTLIBRARIES += \
 	libnetworkd-core.la
 
 libnetworkd_core_la_CFLAGS = \
-	$(AM_CFLAGS)
 
 libnetworkd_core_la_SOURCES = \
 	src/libsystemd-network/network-internal.h \
diff --git a/src/grp-network/systemd-networkd-wait-online/Makefile b/src/grp-network/systemd-networkd-wait-online/Makefile
index 25134d4966..6b6b96258a 100644
--- a/src/grp-network/systemd-networkd-wait-online/Makefile
+++ b/src/grp-network/systemd-networkd-wait-online/Makefile
@@ -27,7 +27,6 @@ rootlibexec_PROGRAMS += \
 	systemd-networkd-wait-online
 
 systemd_networkd_wait_online_CFLAGS = \
-	$(AM_CFLAGS)
 
 systemd_networkd_wait_online_SOURCES = \
 	src/libsystemd-network/network-internal.h \
diff --git a/src/grp-resolve/libbasic-dns/Makefile b/src/grp-resolve/libbasic-dns/Makefile
index b1a760cc10..e5c32d8539 100644
--- a/src/grp-resolve/libbasic-dns/Makefile
+++ b/src/grp-resolve/libbasic-dns/Makefile
@@ -63,7 +63,6 @@ test_resolve_tables_SOURCES = \
 	src/shared/test-tables.h
 
 test_resolve_tables_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GCRYPT_CFLAGS)
 
 test_resolve_tables_LDADD = \
@@ -77,11 +76,9 @@ test_dns_packet_SOURCES = \
 	$(basic_dns_sources)
 
 test_dns_packet_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
 	-DRESOLVE_TEST_DIR=\"$(abs_top_srcdir)/src/resolve/test-data\"
 
 test_dns_packet_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GCRYPT_CFLAGS)
 
 test_dns_packet_LDADD = \
@@ -107,7 +104,6 @@ test_dnssec_SOURCES = \
 	$(basic_dns_sources)
 
 test_dnssec_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GCRYPT_CFLAGS)
 
 test_dnssec_LDADD = \
diff --git a/src/grp-resolve/nss-resolve/Makefile b/src/grp-resolve/nss-resolve/Makefile
index 8ed87994ce..badbacdb3a 100644
--- a/src/grp-resolve/nss-resolve/Makefile
+++ b/src/grp-resolve/nss-resolve/Makefile
@@ -28,7 +28,6 @@ libnss_resolve_la_SOURCES = \
 	src/nss-resolve/nss-resolve.c
 
 libnss_resolve_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-module \
 	-export-dynamic \
 	-avoid-version \
diff --git a/src/grp-resolve/systemd-resolve/Makefile b/src/grp-resolve/systemd-resolve/Makefile
index 6a21bc2559..48c2ec1e26 100644
--- a/src/grp-resolve/systemd-resolve/Makefile
+++ b/src/grp-resolve/systemd-resolve/Makefile
@@ -34,7 +34,6 @@ nodist_systemd_resolve_SOURCES = \
 	src/resolve/dns_type-to-name.h
 
 systemd_resolve_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GCRYPT_CFLAGS)
 
 systemd_resolve_LDADD = \
diff --git a/src/grp-resolve/systemd-resolved/Makefile b/src/grp-resolve/systemd-resolved/Makefile
index 54a8b4f28c..be55959cb2 100644
--- a/src/grp-resolve/systemd-resolved/Makefile
+++ b/src/grp-resolve/systemd-resolved/Makefile
@@ -76,7 +76,6 @@ nodist_systemd_resolved_SOURCES = \
 	src/resolve/resolved-gperf.c
 
 systemd_resolved_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GCRYPT_CFLAGS)
 
 systemd_resolved_LDADD = \
diff --git a/src/grp-system/grp-utils/systemd-analyze/Makefile b/src/grp-system/grp-utils/systemd-analyze/Makefile
index 9d647e5a52..cb1b72e77d 100644
--- a/src/grp-system/grp-utils/systemd-analyze/Makefile
+++ b/src/grp-system/grp-utils/systemd-analyze/Makefile
@@ -30,7 +30,6 @@ systemd_analyze_SOURCES = \
 	src/analyze/analyze-verify.h
 
 systemd_analyze_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
diff --git a/src/grp-system/libcore/Makefile b/src/grp-system/libcore/Makefile
index b31d00fcdb..a72b4dc7ee 100644
--- a/src/grp-system/libcore/Makefile
+++ b/src/grp-system/libcore/Makefile
@@ -147,7 +147,6 @@ nodist_libcore_la_SOURCES = \
 	src/core/load-fragment-gperf-nulstr.c
 
 libcore_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(PAM_CFLAGS) \
 	$(AUDIT_CFLAGS) \
 	$(KMOD_CFLAGS) \
diff --git a/src/grp-system/systemd/Makefile b/src/grp-system/systemd/Makefile
index 2f9d9ac819..4c8f39e7c4 100644
--- a/src/grp-system/systemd/Makefile
+++ b/src/grp-system/systemd/Makefile
@@ -28,7 +28,6 @@ systemd_SOURCES = \
 	src/core/main.c
 
 systemd_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
diff --git a/src/grp-udev/libudev-core/Makefile b/src/grp-udev/libudev-core/Makefile
index e4bf7c64f3..4323fa96ec 100644
--- a/src/grp-udev/libudev-core/Makefile
+++ b/src/grp-udev/libudev-core/Makefile
@@ -67,7 +67,6 @@ gperf_gperf_sources += \
 	src/udev/net/link-config-gperf.gperf
 
 libudev_core_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS) \
 	$(KMOD_CFLAGS)
 
diff --git a/src/libbasic/src/Makefile b/src/libbasic/src/Makefile
index 51fc9dfc84..cac075e617 100644
--- a/src/libbasic/src/Makefile
+++ b/src/libbasic/src/Makefile
@@ -228,7 +228,6 @@ nodist_libbasic_la_SOURCES = \
 	src/basic/cap-to-name.h
 
 libbasic_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SELINUX_CFLAGS) \
 	$(CAP_CFLAGS) \
 	-pthread
diff --git a/src/libshared/src/Makefile b/src/libshared/src/Makefile
index 25332590ac..1fee7da878 100644
--- a/src/libshared/src/Makefile
+++ b/src/libshared/src/Makefile
@@ -131,7 +131,6 @@ libshared_la_SOURCES += \
 endif # HAVE_ACL
 
 libshared_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(ACL_CFLAGS) \
 	$(LIBIDN_CFLAGS) \
 	$(SECCOMP_CFLAGS)
@@ -156,7 +155,6 @@ libsystemd_shared_la_SOURCES = \
 	$(libudev_internal_la_SOURCES)
 
 libsystemd_shared_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(libbasic_la_CFLAGS) \
 	$(libshared_la_CFLAGS) \
 	$(libsystemd_internal_la_CFLAGS) \
@@ -179,7 +177,6 @@ libsystemd_shared_la_LIBADD = \
 	$(SECCOMP_LIBS)
 
 libsystemd_shared_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-release $(PACKAGE_VERSION)
 
 sd.CPPFLAGS += $(addprefix -I,$(call at.path,$(srcdir)/../include $(srcdir)/../include/shared))
diff --git a/src/libsystemd-network/src/Makefile b/src/libsystemd-network/src/Makefile
index 5d5ed6a227..204627a130 100644
--- a/src/libsystemd-network/src/Makefile
+++ b/src/libsystemd-network/src/Makefile
@@ -27,7 +27,6 @@ noinst_LTLIBRARIES += \
 	libsystemd-network.la
 
 libsystemd_network_la_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(KMOD_CFLAGS)
 
 libsystemd_network_la_SOURCES = \
diff --git a/src/libsystemd/Makefile b/src/libsystemd/Makefile
index 77fa162d58..7ee4688791 100644
--- a/src/libsystemd/Makefile
+++ b/src/libsystemd/Makefile
@@ -44,7 +44,6 @@ EXTRA_DIST += \
 	$(libsystemd_journal_internal_la_CFLAGS)
 
 libsystemd_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-version-info $(LIBSYSTEMD_CURRENT):$(LIBSYSTEMD_REVISION):$(LIBSYSTEMD_AGE) \
 	-Wl,--version-script=$(srcdir)/libsystemd.sym
 
diff --git a/src/libsystemd/src/Makefile b/src/libsystemd/src/Makefile
index 61430ba68d..4554061f93 100644
--- a/src/libsystemd/src/Makefile
+++ b/src/libsystemd/src/Makefile
@@ -150,7 +150,6 @@ gperf_txt_sources += \
 
 # using _CFLAGS = in the conditional below would suppress AM_CFLAGS
 libsystemd_journal_internal_la_CFLAGS = \
-	$(AM_CFLAGS)
 
 libsystemd_journal_internal_la_LIBADD =
 
diff --git a/src/libsystemd/src/test.mk b/src/libsystemd/src/test.mk
index 24ddf29958..e75904d554 100644
--- a/src/libsystemd/src/test.mk
+++ b/src/libsystemd/src/test.mk
@@ -30,7 +30,6 @@ test_bus_marshal_LDADD = \
 	$(DBUS_LIBS)
 
 test_bus_marshal_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(DBUS_CFLAGS)
 
@@ -50,7 +49,6 @@ test_bus_cleanup_SOURCES = \
 	src/libsystemd/sd-bus/test-bus-cleanup.c
 
 test_bus_cleanup_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
 test_bus_cleanup_LDADD = \
@@ -83,7 +81,6 @@ test_bus_gvariant_LDADD = \
 	$(GLIB_LIBS)
 
 test_bus_gvariant_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(GLIB_CFLAGS)
 
 test_bus_creds_SOURCES = \
diff --git a/src/libudev/Makefile b/src/libudev/Makefile
index 8224a52d8b..1e42e62d17 100644
--- a/src/libudev/Makefile
+++ b/src/libudev/Makefile
@@ -34,7 +34,6 @@ rootlib_LTLIBRARIES += \
 	libudev.la
 
 libudev_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE) \
 	-Wl,--version-script=$(srcdir)/libudev.sym
 
@@ -54,7 +53,6 @@ $(outdir)/test-libudev-sym.c: \
 nodist_test_libudev_sym_SOURCES = \
 	test-libudev-sym.c
 test_libudev_sym_CFLAGS = \
-	$(AM_CFLAGS) \
 	-Wno-deprecated-declarations
 test_libudev_sym_LDADD = \
 	libudev.la
diff --git a/src/nss-myhostname/Makefile b/src/nss-myhostname/Makefile
index c98ab37e08..4aa0c45cdd 100644
--- a/src/nss-myhostname/Makefile
+++ b/src/nss-myhostname/Makefile
@@ -29,7 +29,6 @@ libnss_myhostname_la_SOURCES = \
 	src/nss-myhostname/nss-myhostname.c
 
 libnss_myhostname_la_LDFLAGS = \
-	$(AM_LDFLAGS) \
 	-module \
 	-export-dynamic \
 	-avoid-version \
diff --git a/src/systemd-cryptsetup/Makefile b/src/systemd-cryptsetup/Makefile
index 346eab772a..96a2bfe99a 100644
--- a/src/systemd-cryptsetup/Makefile
+++ b/src/systemd-cryptsetup/Makefile
@@ -38,7 +38,6 @@ systemd_cryptsetup_SOURCES = \
 	src/cryptsetup/cryptsetup.c
 
 systemd_cryptsetup_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(LIBCRYPTSETUP_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
diff --git a/src/systemd-gpt-auto-generator/Makefile b/src/systemd-gpt-auto-generator/Makefile
index 4e88a88977..9770945db5 100644
--- a/src/systemd-gpt-auto-generator/Makefile
+++ b/src/systemd-gpt-auto-generator/Makefile
@@ -36,7 +36,6 @@ systemd_gpt_auto_generator_LDADD = \
 	$(BLKID_LIBS)
 
 systemd_gpt_auto_generator_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(BLKID_CFLAGS)
 endif # HAVE_BLKID
 
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 0c008808d8..6f02aa5f1e 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -58,7 +58,6 @@ gperf_gperf_sources += \
 	src/nspawn/nspawn-gperf.gperf
 
 systemd_nspawn_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(ACL_CFLAGS) \
 	$(BLKID_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
@@ -82,7 +81,6 @@ test_patch_uid_SOURCES = \
 	src/nspawn/test-patch-uid.c
 
 test_patch_uid_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(ACL_CFLAGS)
 
 test_patch_uid_LDADD = \
diff --git a/test/Makefile b/test/Makefile
index d2b873ac33..cd08325711 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -259,7 +259,6 @@ test_engine_SOURCES = \
 	src/test/test-engine.c
 
 test_engine_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
@@ -270,7 +269,6 @@ test_job_type_SOURCES = \
 	src/test/test-job-type.c
 
 test_job_type_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
@@ -281,7 +279,6 @@ test_ns_SOURCES = \
 	src/test/test-ns.c
 
 test_ns_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
 test_ns_LDADD = \
@@ -321,7 +318,6 @@ test_unit_name_SOURCES = \
 	src/test/test-unit-name.c
 
 test_unit_name_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
@@ -332,7 +328,6 @@ test_unit_file_SOURCES = \
 	src/test/test-unit-file.c
 
 test_unit_file_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
@@ -349,7 +344,6 @@ test_capability_SOURCES = \
 	src/test/test-capability.c
 
 test_capability_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(CAP_CFLAGS)
 
 test_capability_LDADD = \
@@ -541,7 +535,6 @@ test_cap_list_SOURCES = \
 	src/test/test-cap-list.c
 
 test_cap_list_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(CAP_CFLAGS)
 
 test_cap_list_LDADD = \
@@ -624,7 +617,6 @@ BUILT_SOURCES += \
 	src/test/test-hashmap-ordered.c
 
 $(outdir)/test-hashmap-ordered.c: src/test/test-hashmap-plain.c
-	$(AM_V_at)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)$(AWK) 'BEGIN { print "/* GENERATED FILE */\n#define ORDERED" } \
 	                   { if (!match($$0, "^#include"))          \
 	                         gsub(/hashmap/, "ordered_hashmap"); \
@@ -679,10 +671,8 @@ test_tables_SOURCES = \
 	src/journal/journald-server.h
 
 test_tables_CPPFLAGS = \
-	$(AM_CPPFLAGS)
 
 test_tables_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
@@ -744,7 +734,6 @@ test_firewall_util_SOURCES = \
 	src/test/test-firewall-util.c
 
 test_firewall_util_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(LIBIPTC_CFLAGS)
 
 test_firewall_util_LDADD = \
@@ -757,7 +746,6 @@ test_netlink_manual_SOURCES = \
 	src/test/test-netlink-manual.c
 
 test_netlink_manual_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(KMOD_CFLAGS)
 
 test_netlink_manual_LDADD = \
@@ -816,11 +804,9 @@ test_cgroup_mask_SOURCES = \
 	src/test/test-cgroup-mask.c
 
 test_cgroup_mask_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
 	$(MOUNT_CFLAGS)
 
 test_cgroup_mask_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
 test_cgroup_mask_LDADD = \
@@ -860,7 +846,6 @@ test_path_SOURCES = \
 	src/test/test-path.c
 
 test_path_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
 test_path_LDADD = \
@@ -870,7 +855,6 @@ test_execute_SOURCES = \
 	src/test/test-execute.c
 
 test_execute_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(MOUNT_CFLAGS)
 
 test_execute_LDADD = \
@@ -904,11 +888,9 @@ test_sched_prio_SOURCES = \
 	src/test/test-sched-prio.c
 
 test_sched_prio_CPPFLAGS = \
-	$(AM_CPPFLAGS) \
 	$(MOUNT_CFLAGS)
 
 test_sched_prio_CFLAGS = \
-	$(AM_CFLAGS) \
 	$(SECCOMP_CFLAGS)
 
 test_sched_prio_LDADD = \
diff --git a/tools/notsd-move b/tools/notsd-move
index 5a907109bd..2f6ad3f1b0 100755
--- a/tools/notsd-move
+++ b/tools/notsd-move
@@ -742,12 +742,12 @@ breakup_makefile() (
 fixup_makefile() {
 	sed -r \
 	    -e '#### Specific complete strings #####' \
-	    -e 's|\$\(CPP\)·\$\(CFLAGS\)·\$\(AM_CPPFLAGS\)·\$\(CPPFLAGS\)·|$(CPP) $(sd.ALL_CPPFLAGS) |g' \
+	    -e 's|\$\(CPP\) \$\(CFLAGS\) \$\(AM_CPPFLAGS\) \$\(CPPFLAGS\)|$(CPP) $(sd.ALL_CPPFLAGS)|g' \
 	    -e '/^	\$\(AM_V_at\)\$\(MKDIR_P\) \$\(dir \$@\)/d' \
 	    -e '#### General cases #################' \
 	    -e '/^[^#	]*:/ { s|^(\s*)\S+/|\1$(outdir)/| }' \
 	    -e 's|^if (.*)|ifneq ($(\1),)|' \
-	    -e '/\bAM_(C|CPP|LD)FLAGS\b/d' \
+	    -e '/^\s*\$\(AM_(C|CPP|LD)FLAGS\b/d' \
 	    -e 's|--version-script=.*/([^/]+)\.sym|--version-script=$(srcdir)/\1.sym|g'
 }