new autothing

5 files changed, 9 insertions, 9 deletions

diff --git a/src/libbasic/Makefile b/src/libbasic/Makefile
index de5da89a24..51ee19aad4 100644
--- a/src/libbasic/Makefile
+++ b/src/libbasic/Makefile
@@ -21,7 +21,7 @@
 #  You should have received a copy of the GNU Lesser General Public License
 #  along with systemd; If not, see <http://www.gnu.org/licenses/>.
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 libbasic_la_SOURCES = \
 	src/basic/missing.h \
@@ -216,14 +216,14 @@ libbasic_la_SOURCES = \
 	src/basic/formats-util.h \
 	src/basic/nss-util.h
 
-am_out_files = libbasic.la
+std.out_files = libbasic.la
 CFLAGS += -pthread
 CPPFLAGS += $(libsystemd.CPPFLAGS) $(libselinux.CPPFLAGS) $(libcap.CPPFLAGS)
 $(outdir)/libbasic.la: \
 	$(patsubst src/basic/%.c,$(outdir)/%.lo,$(filter %.c,$(libbasic_la_SOURCES))) \
 	$(libselinux.DEPENDS) $(libcap.DEPENDS) -lrt -lm
 
-am_clean_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt
+std.gen_files += *-to-name.h *-from-name.h *-from-name.gperf *-list.txt
 
 $(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
@@ -267,4 +267,4 @@ $(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 <$< >$@
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/libfirewall/Makefile b/src/libfirewall/Makefile
index c6519157c6..a6a4bc9ebc 100644
--- a/src/libfirewall/Makefile
+++ b/src/libfirewall/Makefile
@@ -23,7 +23,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
 include $(topsrcdir)/automake.head.mk
 
-am_out_files = libfirewall.la
+std.out_files = libfirewall.la
 CPPFLAGS += $(libbasic.CPPFLAGS) $(libiptc.CPPFLAGS)
 $(outdir)/libfirewall.la: $(outdir)/firewall-util.lo $(libiptc.DEPENDS)
 
diff --git a/src/libshared/Makefile b/src/libshared/Makefile
index b2aaf58b2c..66a38ea7f8 100644
--- a/src/libshared/Makefile
+++ b/src/libshared/Makefile
@@ -137,7 +137,7 @@ libshared_la_LIBADD = \
 	$(LIBIDN_LIBS) \
 	$(SECCOMP_LIBS)
 
-am_out_files += libshared.la
+std.out_files += libshared.la
 CPPFLAGS += -I$(topsrcdir)/src/libsystemd/include
 CPPFLAGS += -I$(topoutdir)/src/libsystemd/include
 CPPFLAGS += -I$(topsrcdir)/src/libbasic
diff --git a/src/libsystemd/libsystemd-internal/Makefile b/src/libsystemd/libsystemd-internal/Makefile
index 9874139a9f..995eff1659 100644
--- a/src/libsystemd/libsystemd-internal/Makefile
+++ b/src/libsystemd/libsystemd-internal/Makefile
@@ -120,10 +120,10 @@ libsystemd_internal_la_LIBADD = \
 noinst_LTLIBRARIES += \
 	libsystemd-internal.la
 
-am_out_files += libsystemd-internal.la
+std.out_files += libsystemd-internal.la
 CPPFLAGS += $(libsystemd.CPPFLAGS) $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS)
 CPPFLAGS += -DLIBDIR=\"$(libdir)\" -DUDEVLIBEXECDIR=\"$(udevlibexecdir)\"
-am_subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))))
+am.subdirs += $(dir $(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))))
 $(outdir)/libsystemd-internal.la: \
 	$(patsubst src/libsystemd/%.c,$(outdir)/%.lo,$(filter %.c,$(libsystemd_internal_la_SOURCES))) \
 	$(libbasic.DEPENDS) -lresolv
diff --git a/src/systemd-nspawn/Makefile b/src/systemd-nspawn/Makefile
index 9adc4a0dea..0bcc238b72 100644
--- a/src/systemd-nspawn/Makefile
+++ b/src/systemd-nspawn/Makefile
@@ -52,7 +52,7 @@ nodist_systemd_nspawn_SOURCES = \
 gperf_gperf_sources += \
 	src/nspawn/nspawn-gperf.gperf
 
-am_out_files = systemd-nspawn
+std.out_files = systemd-nspawn
 CPPFLAGS += $(libbasic.CPPFLAGS) $(libshared.CPPFLAGS) $(libsystemd.CPPFLAGS) $(libudev.CPPFLAGS) $(libblkid.CPPFLAGS)
 CPPFLAGS += -I$(topsrcdir)/src/libsystemd/src/sd-netlink -I$(topsrcdir)/src/libsystemd/src/sd-bus -I$(topsrcdir)/src/udev -I$(topsrcdir)/src/libudev/src
 CPPFLAGS += $(libblkid.CPPFLAGS) $(libseccomp.CPPFLAGS)