Work with the new version of autothing.

11 files changed, 28 insertions, 28 deletions

diff --git a/src/Makefile b/src/Makefile
index e1e5cf4..273a34b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 pkgconfdir = $(sysconfdir)
 
 srcfiles-ignore/$(srcdir) = $(addsuffix /%,abslibre-tools chroot-tools devtools gitget lib librefetch toru xbs xbs-abs xbs-abslibre)
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/abslibre-tools/Makefile b/src/abslibre-tools/Makefile
index 2903f4a..a1b7765 100644
--- a/src/abslibre-tools/Makefile
+++ b/src/abslibre-tools/Makefile
@@ -1,4 +1,4 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/chroot-tools/Makefile b/src/chroot-tools/Makefile
index 48a1631..96fb837 100644
--- a/src/chroot-tools/Makefile
+++ b/src/chroot-tools/Makefile
@@ -1,19 +1,19 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 pkglibexecdir = $(libexecdir)/libretools/chroot
 
 libretools-bins      = chcleanup librechroot libremakepkg
 libretools-libexecs += arch-nspawn chcleanup distcc-tool indent mkarchroot
 libretools-libs     += makechrootpkg.sh
 devtools-files       = makechrootpkg.sh.in mkarchroot.in arch-nspawn.in
-am_clean_files      += chcleanup.lib
+std.clean_files     += chcleanup.lib
 
 $(srcdir)/makechrootpkg.sh.in: $(srcdir)/%.sh.in: $(devtoolsdir)/%.in
 	cp $< $@
 
 $(outdir)/chcleanup: $(srcdir)/chcleanup.in $(outdir)/chcleanup.lib
 	m4 -I$(@D) -P $< | $(edit) | install -m755 /dev/stdin $@
-$(outdir)/chcleanup.lib: $(call _am_path,$(topoutdir)/src/lib/common.sh) $(outdir)/Makefile
+$(outdir)/chcleanup.lib: $(call at.path,$(topoutdir)/src/lib/common.sh) $(outdir)/Makefile
 	bash -c '. $<; declare -f _l plain msg msg2 error' > $@
 
 $(outdir)/distcc-tool.pot: LIBREXGETTEXT_FLAGS+=--simple=errusage
@@ -22,6 +22,6 @@ $(DESTDIR)$(bindir)/chcleanup: $(var)bindir $(var)libexecdir
 	mkdir -p $(@D)
 	ln -srfT $(DESTDIR)$(libexecdir)/libretools/chroot/chcleanup $@
 
-am_depdirs = ../lib
+at.depdirs += ../lib
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/devtools/Makefile b/src/devtools/Makefile
index 72907f0..6d3f88c 100644
--- a/src/devtools/Makefile
+++ b/src/devtools/Makefile
@@ -1,12 +1,12 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 libretools-bins += checkpkg find-libdeps finddeps lddd
 devtools-files   = $(addsuffix .in,$(libretools-bins))
-am_sys_files    += $(bindir)/find-libprovides
+std.sys_files   += $(bindir)/find-libprovides
 
 $(DESTDIR)$(bindir)/find-libprovides:
 	install -d $(@D)
 	ln -sf find-libdeps $@
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/gitget/Makefile b/src/gitget/Makefile
index 2903f4a..a1b7765 100644
--- a/src/gitget/Makefile
+++ b/src/gitget/Makefile
@@ -1,4 +1,4 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/lib/Makefile b/src/lib/Makefile
index 9e9b4a8..9d52440 100644
--- a/src/lib/Makefile
+++ b/src/lib/Makefile
@@ -1,5 +1,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 libretools-libs += common.sh conf.sh
 devtools-files = common.sh.in
@@ -42,4 +42,4 @@ $(outdir)/librexgettext.pot: LIBREXGETTEXT_FLAGS += --simple=errusage
 
 ######################################################################
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/librefetch/Makefile b/src/librefetch/Makefile
index 26ee2ee..b40c15b 100644
--- a/src/librefetch/Makefile
+++ b/src/librefetch/Makefile
@@ -1,5 +1,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
 libretools-bins      = librefetch librefetch-install
 libretools-confs    += librefetch-makepkg.conf
@@ -10,4 +10,4 @@ pots                 = $(libretools-bins)
 $(outdir)/librefetch-install: $(var)pkgconfdir
 $(outdir)/librefetch-makepkg.conf: $(var)bindir
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/toru/Makefile b/src/toru/Makefile
index 2903f4a..a1b7765 100644
--- a/src/toru/Makefile
+++ b/src/toru/Makefile
@@ -1,4 +1,4 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/xbs-abs/Makefile b/src/xbs-abs/Makefile
index 248848f..65be914 100644
--- a/src/xbs-abs/Makefile
+++ b/src/xbs-abs/Makefile
@@ -1,5 +1,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 pkgconfdir = $(sysconfdir)/xbs
 pkglibexecdir = $(libexecdir)/xbs
 
@@ -8,8 +8,8 @@ libretools-bins      =
 libretools-libexecs  = helper-abs
 pots             += $(_helpers)
 devtools-files   += $(addsuffix .in,$(_helpers))
-am_out_files     += $(_helpers)
-am_sys_files     += $(addprefix $(pkglibexecdir)/helper-abs.d/,$(_helpers))
+std.out_files    += $(_helpers)
+std.sys_files    += $(addprefix $(pkglibexecdir)/helper-abs.d/,$(_helpers))
 
 $(outdir)/commitpkg: $(srcdir)/commitpkg.in
 	@echo "OUT $@"
@@ -24,4 +24,4 @@ $(outdir)/commitpkg: $(srcdir)/commitpkg.in
 $(DESTDIR)$(pkglibexecdir)/helper-abs.d/%: $(srcdir)/%
 	install -Dm755 '$<' '$@'
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/xbs-abslibre/Makefile b/src/xbs-abslibre/Makefile
index c946d5d..71da5e7 100644
--- a/src/xbs-abslibre/Makefile
+++ b/src/xbs-abslibre/Makefile
@@ -1,8 +1,8 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 pkglibexecdir = $(libexecdir)/xbs
 
 libretools-bins     =
 libretools-libexecs = helper-abslibre
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk
diff --git a/src/xbs/Makefile b/src/xbs/Makefile
index 974586e..24067e9 100644
--- a/src/xbs/Makefile
+++ b/src/xbs/Makefile
@@ -1,5 +1,5 @@
 include $(dir $(lastword $(MAKEFILE_LIST)))/../../config.mk
-include $(topsrcdir)/automake.head.mk
+include $(topsrcdir)/build-aux/Makefile.head.mk
 pkgconfdir = $(sysconfdir)/xbs
 
-include $(topsrcdir)/automake.tail.mk
+include $(topsrcdir)/build-aux/Makefile.tail.mk