build: move cfg.mk and maint.mk into build-aux directory

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

GNUmakefile

@@ -20,6 +20,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
+_build-aux ?= build-aux
+_autoreconf ?= autoreconf -v
+
 # Systems where /bin/sh is not the default shell need this.  The $(shell)
 # command below won't work with e.g. stock DOS/Windows shells.
 ifeq ($(wildcard /bin/s[h]),/bin/sh)
@@ -44,13 +47,8 @@ ALL_RECURSIVE_TARGETS =
 include Makefile
 
 # Some projects override e.g., _autoreconf here.
--include $(srcdir)/cfg.mk
-
-# Allow cfg.mk to override these.
-_build-aux ?= build-aux
-_autoreconf ?= autoreconf -v
-
-include $(srcdir)/maint.mk
+include $(srcdir)/$(_build-aux)/cfg.mk
+include $(srcdir)/$(_build-aux)/maint.mk
 
 # Ensure that $(VERSION) is up to date for dist-related targets, but not
 # for others: rerunning autoreconf and recompiling everything isn't cheap.
@@ -100,8 +98,8 @@ else
 srcdir = .
 
 # The package can override .DEFAULT_GOAL to run actions like autoreconf.
--include ./cfg.mk
-include ./maint.mk
+include $(srcdir)/$(_build-aux)/cfg.mk
+include $(srcdir)/$(_build-aux)/maint.mk
 
 ifeq ($(.DEFAULT_GOAL),abort-due-to-no-makefile)
 $(MAKECMDGOALS): abort-due-to-no-makefile

Makefile.am

@@ -9,9 +9,9 @@ EXTRA_DIST =					\
 	$(PACKAGE).spec	$(PACKAGE).spec.in	\
 	mingw-$(PACKAGE).spec.in		\
 	GNUmakefile				\
-	maint.mk				\
-	cfg.mk					\
+	build-aux/cfg.mk			\
 	build-aux/gitlog-to-changelog		\
+	build-aux/maint.mk			\
 	build-aux/useless-if-before-free	\
 	build-aux/vc-list-files			\
 	AUTHORS.in				\

build-aux/cfg.mk

@@ -55,7 +55,7 @@ local-checks-to-skip =			\
 
 # Files that should never cause syntax check failures.
 VC_LIST_ALWAYS_EXCLUDE_REGEX = \
-  (^HACKING|\.po|maint.mk)$$
+  (^HACKING|\.po|build-aux/maint.mk)$$
 
 # Functions like free() that are no-ops on NULL arguments.
 useless_free_options =				\

build-aux/maint.mk

@@ -19,7 +19,7 @@
 
 # This is reported not to work with make-3.79.1
 # ME := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-ME := maint.mk
+ME := $(_build-aux)/maint.mk
 
 # Diagnostic for continued use of deprecated variable.
 # Remove in 2013
@@ -124,7 +124,7 @@ export LC_ALL = C
 ## Sanity checks.  ##
 ## --------------- ##
 
-_cfg_mk := $(shell test -f $(srcdir)/cfg.mk && echo '$(srcdir)/cfg.mk')
+_cfg_mk := $(shell test -f $(srcdir)/$(_build-aux)/cfg.mk && echo '$(srcdir)/$(_build-aux)/cfg.mk')
 
 # Collect the names of rules starting with `sc_'.
 syntax-check-rules := $(sort $(shell sed -n 's/^\(sc_[a-zA-Z0-9_-]*\):.*/\1/p' \
@@ -1007,7 +1007,7 @@ sc_immutable_NEWS:
 # for any corrections to old entries.
 update-NEWS-hash: NEWS
 	perl -pi -e 's/^(old_NEWS_hash[ \t]+:?=[ \t]+).*/$${1}'"$(NEWS_hash)/" \
-	  $(srcdir)/cfg.mk
+	  $(srcdir)/$(_build-aux)/cfg.mk
 
 # Ensure that we use only the standard $(VAR) notation,
 # not @...@ in Makefile.am, now that we can rely on automake
@@ -1425,7 +1425,7 @@ _gl_TS_dir ?= src
 ALL_RECURSIVE_TARGETS += sc_tight_scope
 sc_tight_scope: tight-scope.mk
 	@fail=0;							\
-	if ! grep '^ *export _gl_TS_headers *=' $(srcdir)/cfg.mk	\
+	if ! grep '^ *export _gl_TS_headers *=' $(srcdir)/$(_build-aux)/cfg.mk	\
 		> /dev/null						\
 	   && ! grep -w noinst_HEADERS $(srcdir)/$(_gl_TS_dir)/Makefile.am \
 		> /dev/null 2>&1; then					\
@@ -1433,7 +1433,7 @@ sc_tight_scope: tight-scope.mk
 	else								\
 	    $(MAKE) -s -C $(_gl_TS_dir)					\
 		-f Makefile						\
-		-f $(abs_top_srcdir)/cfg.mk				\
+		-f $(abs_top_srcdir)/$(_build-aux)/cfg.mk		\
 		-f $(abs_top_builddir)/$<				\
 	      _gl_tight_scope						\
 		|| fail=1;						\