share/mk/: Configure several tools in share/mk/configure/*

Signed-off-by: Alejandro Colomar <alx@kernel.org>

28 files changed, 100 insertions, 39 deletions

diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index e4654a2..2e2d81b 100644
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_BUILD_INCLUDED
 MAKEFILE_BUILD_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 
 
 .PHONY: build
diff --git a/share/mk/build/dev-pc.mk b/share/mk/build/dev-pc.mk
index b372929..aada2f4 100644
--- a/share/mk/build/dev-pc.mk
+++ b/share/mk/build/dev-pc.mk
@@ -6,8 +6,9 @@ ifndef MAKEFILE_BUILD_DEV_PC_INCLUDED
 MAKEFILE_BUILD_DEV_PC_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/configure/pkgconf.mk
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 include $(MAKEFILEDIR)/install/_.mk
 include $(MAKEFILEDIR)/src.mk
 include $(MAKEFILEDIR)/version.mk
diff --git a/share/mk/build/dev-src.mk b/share/mk/build/dev-src.mk
index 2660d7a..16ffff7 100644
--- a/share/mk/build/dev-src.mk
+++ b/share/mk/build/dev-src.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_BUILD_DEV_INCLUDE_INCLUDED
 MAKEFILE_BUILD_DEV_INCLUDE_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/src.mk
 
 
diff --git a/share/mk/build/lib-static.mk b/share/mk/build/lib-static.mk
index 48fbc7c..c96f564 100644
--- a/share/mk/build/lib-static.mk
+++ b/share/mk/build/lib-static.mk
@@ -8,8 +8,10 @@ MAKEFILE_BUILD_LIB_STATIC_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/build/obj-as.mk
-include $(MAKEFILEDIR)/cmd.mk
 include $(MAKEFILEDIR)/configure/ar.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/configure/findutils.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 include $(MAKEFILEDIR)/version.mk
 
 
diff --git a/share/mk/check.mk b/share/mk/check.mk
index 7ac6ec3..9c2b76b 100644
--- a/share/mk/check.mk
+++ b/share/mk/check.mk
@@ -9,6 +9,9 @@ MAKEFILE_CHECK_INCLUDED := 1
 include $(MAKEFILEDIR)/build/lib-shared.mk
 include $(MAKEFILEDIR)/build/lib-static.mk
 include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/configure/findutils.mk
+include $(MAKEFILEDIR)/configure/grep.mk
 include $(MAKEFILEDIR)/configure/pkgconf.mk
 include $(MAKEFILEDIR)/install/dev-include.mk
 include $(MAKEFILEDIR)/install/lib-shared.mk
@@ -32,7 +35,7 @@ $(_TESTS_c): $(builddir)/%.check: $(srcdir)/share/% $(MK) $(TU_h) $(_LIB_a) $(_L
 $(_TESTS_sh): $(builddir)/%.check.touch: $(srcdir)/share/% $(MK) $(TU_h) $(_LIB_a) $(_LIB_so_v) | $$(@D)/
 	$(info	CHECK	$@)
 	PKG_CONFIG_LIBDIR=$(PCDIR) $<
-	touch $@
+	$(TOUCH) $@
 
 $(_tests_c): $(builddir)/%.installcheck: $(srcdir)/share/% $(MK) $(_tu_h) $(_lib_a) $(_lib_so) | $$(@D)/
 	$(info	INSTALLCHECK	$@)
@@ -42,7 +45,7 @@ $(_tests_c): $(builddir)/%.installcheck: $(srcdir)/share/% $(MK) $(_tu_h) $(_lib
 $(_tests_sh): $(builddir)/%.installcheck.touch: $(srcdir)/share/% $(MK) $(_tu_h) $(_lib_a) $(_lib_so) | $$(@D)/
 	$(info	INSTALLCHECK	$@)
 	$<
-	touch $@
+	$(TOUCH) $@
 
 
 .PHONY: check
diff --git a/share/mk/configure/cc.mk b/share/mk/configure/cc.mk
index b6bc1f0..6531ba6 100644
--- a/share/mk/configure/cc.mk
+++ b/share/mk/configure/cc.mk
@@ -6,7 +6,9 @@ ifndef MAKEFILE_CONFIGURE_CC_INCLUDED
 MAKEFILE_CONFIGURE_CC_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/configure/grep.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 
 
 export CC      := gcc
@@ -19,8 +21,8 @@ CC_VENDOR := \
 		| $(SED) '/gcc version/s/.*/gcc/' \
 		| $(SED) '/clang version/s/.*/clang/' \
 		| $(SED) '/Apple LLVM version/s/.*/clang/' \
-		| grep -e '^gcc$$' -e '^clang$$' \
-		|| echo unknown; \
+		| $(GREP) -e '^gcc$$' -e '^clang$$' \
+		|| $(ECHO) unknown; \
 	)
 
 
diff --git a/share/mk/cmd.mk b/share/mk/configure/coreutils.mk
index 6dc4d79..1662c82 100644
--- a/share/mk/cmd.mk
+++ b/share/mk/configure/coreutils.mk
@@ -2,24 +2,24 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_CMD_INCLUDED
-MAKEFILE_CMD_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_COREUTILS_INCLUDED
+MAKEFILE_CONFIGURE_COREUTILS_INCLUDED := 1
 
 
 CP      := cp
 CUT     := cut
 ECHO    := echo
-FIND    := find
-GIT     := git
-GREP    := grep
 INSTALL := install
 LN      := ln
 RM      := rm
-SED     := sed
 SORT    := sort
 TAC     := tac
 TOUCH   := touch
-XARGS   := xargs
+
+
+INSTALL_DATA    := $(INSTALL) -m 644
+INSTALL_DIR     := $(INSTALL) -m 755 -d
+INSTALL_PROGRAM := $(INSTALL) -m 755
 
 
 endif  # include guard
diff --git a/share/mk/configure/findutils.mk b/share/mk/configure/findutils.mk
new file mode 100644
index 0000000..a042ffb
--- /dev/null
+++ b/share/mk/configure/findutils.mk
@@ -0,0 +1,13 @@
+# Copyright 2022-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_FINDUTILS_INCLUDED
+MAKEFILE_CONFIGURE_FINDUTILS_INCLUDED := 1
+
+
+FIND    := find
+XARGS   := xargs
+
+
+endif  # include guard
diff --git a/share/mk/configure/git.mk b/share/mk/configure/git.mk
new file mode 100644
index 0000000..80f2a71
--- /dev/null
+++ b/share/mk/configure/git.mk
@@ -0,0 +1,12 @@
+# Copyright 2022-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_GIT_INCLUDED
+MAKEFILE_CONFIGURE_GIT_INCLUDED := 1
+
+
+GIT     := git
+
+
+endif  # include guard
diff --git a/share/mk/configure/grep.mk b/share/mk/configure/grep.mk
new file mode 100644
index 0000000..dc3ae96
--- /dev/null
+++ b/share/mk/configure/grep.mk
@@ -0,0 +1,12 @@
+# Copyright 2022-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_GREP_INCLUDED
+MAKEFILE_CONFIGURE_GREP_INCLUDED := 1
+
+
+GREP    := grep
+
+
+endif  # include guard
diff --git a/share/mk/configure/ld.mk b/share/mk/configure/ld.mk
index c9ffae1..dff8296 100644
--- a/share/mk/configure/ld.mk
+++ b/share/mk/configure/ld.mk
@@ -6,9 +6,9 @@ ifndef MAKEFILE_CONFIGURE_LD_INCLUDED
 MAKEFILE_CONFIGURE_LD_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
 include $(MAKEFILEDIR)/configure/cc.mk
 include $(MAKEFILEDIR)/configure/pkgconf.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 include $(MAKEFILEDIR)/verbose.mk
 include $(MAKEFILEDIR)/version.mk
 
diff --git a/share/mk/configure/sed.mk b/share/mk/configure/sed.mk
new file mode 100644
index 0000000..39ef40e
--- /dev/null
+++ b/share/mk/configure/sed.mk
@@ -0,0 +1,12 @@
+# Copyright 2022-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_SED_INCLUDED
+MAKEFILE_CONFIGURE_SED_INCLUDED := 1
+
+
+SED := sed
+
+
+endif  # include guard
diff --git a/share/mk/dist/files.mk b/share/mk/dist/files.mk
index 713321a..f288949 100644
--- a/share/mk/dist/files.mk
+++ b/share/mk/dist/files.mk
@@ -6,7 +6,9 @@ ifndef MAKEFILE_DIST_FILES_INCLUDED
 MAKEFILE_DIST_FILES_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/configure/git.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 include $(MAKEFILEDIR)/dist/_.mk
 include $(MAKEFILEDIR)/version.mk
 include $(MAKEFILEDIR)/verbose.mk
diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk
index f65feb4..266e714 100644
--- a/share/mk/dist/tar.mk
+++ b/share/mk/dist/tar.mk
@@ -6,7 +6,9 @@ ifndef MAKEFILE_DIST_TAR_INCLUDED
 MAKEFILE_DIST_TAR_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/findutils.mk
+include $(MAKEFILEDIR)/configure/git.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 include $(MAKEFILEDIR)/configure/tar.mk
 include $(MAKEFILEDIR)/dist/_.mk
 include $(MAKEFILEDIR)/dist/files.mk
diff --git a/share/mk/dist/z.mk b/share/mk/dist/z.mk
index fe35530..d93a836 100644
--- a/share/mk/dist/z.mk
+++ b/share/mk/dist/z.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_DIST_Z_INCLUDED
 MAKEFILE_DIST_Z_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/configure/z.mk
 include $(MAKEFILEDIR)/dist/tar.mk
 
diff --git a/share/mk/install/_.mk b/share/mk/install/_.mk
index 7554e5e..8408870 100644
--- a/share/mk/install/_.mk
+++ b/share/mk/install/_.mk
@@ -6,7 +6,8 @@ ifndef MAKEFILE_INSTALL_INCLUDED
 MAKEFILE_INSTALL_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/version.mk
 
 
 DESTDIR      :=
@@ -36,11 +37,6 @@ _man3dir     := $(DESTDIR)$(man3dir)
 _man3headdir := $(DESTDIR)$(man3headdir)
 
 
-INSTALL_DATA    := $(INSTALL) -m 644
-INSTALL_DIR     := $(INSTALL) -m 755 -d
-INSTALL_PROGRAM := $(INSTALL) -m 755
-
-
 %/:
 	+$(info	INSTALL		$@)
 	+$(INSTALL_DIR) $@
diff --git a/share/mk/install/dev-include.mk b/share/mk/install/dev-include.mk
index f05b8cf..ffd88bf 100644
--- a/share/mk/install/dev-include.mk
+++ b/share/mk/install/dev-include.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_INSTALL_DEV_INCLUDE_INCLUDED
 MAKEFILE_INSTALL_DEV_INCLUDE_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/install/_.mk
 include $(MAKEFILEDIR)/src.mk
 
diff --git a/share/mk/install/dev-pc.mk b/share/mk/install/dev-pc.mk
index 86a9be9..d9fce9e 100644
--- a/share/mk/install/dev-pc.mk
+++ b/share/mk/install/dev-pc.mk
@@ -7,7 +7,7 @@ MAKEFILE_INSTALL_DEV_PC_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/dev-pc.mk
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/install/_.mk
 
 
diff --git a/share/mk/install/lib-shared.mk b/share/mk/install/lib-shared.mk
index 1821fce..862d42b 100644
--- a/share/mk/install/lib-shared.mk
+++ b/share/mk/install/lib-shared.mk
@@ -7,9 +7,8 @@ MAKEFILE_INSTALL_LIB_SHARED_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/lib-shared.mk
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/install/_.mk
-include $(MAKEFILEDIR)/src.mk
 include $(MAKEFILEDIR)/version.mk
 
 
diff --git a/share/mk/install/lib-static.mk b/share/mk/install/lib-static.mk
index b34bcc9..c775c1d 100644
--- a/share/mk/install/lib-static.mk
+++ b/share/mk/install/lib-static.mk
@@ -7,7 +7,7 @@ MAKEFILE_INSTALL_LIB_STATIC_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/lib-static.mk
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/install/_.mk
 include $(MAKEFILEDIR)/src.mk
 
diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index 4d265f2..1e80952 100644
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -6,6 +6,7 @@ ifndef MAKEFILE_INSTALL_MAN_INCLUDED
 MAKEFILE_INSTALL_MAN_INCLUDED := 1
 
 
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/install/_.mk
 include $(MAKEFILEDIR)/src.mk
 
diff --git a/share/mk/lint/c-checkpatch.mk b/share/mk/lint/c-checkpatch.mk
index 998d4e4..6e66572 100644
--- a/share/mk/lint/c-checkpatch.mk
+++ b/share/mk/lint/c-checkpatch.mk
@@ -7,8 +7,8 @@ MAKEFILE_LINT_C_CHECKPATCH_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/dev-src.mk
-include $(MAKEFILEDIR)/cmd.mk
 include $(MAKEFILEDIR)/configure/checkpatch.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 
 
 _TU_h_ckp  := $(addsuffix .lint-c.checkpatch.touch,$(_TU_h))
diff --git a/share/mk/lint/c-clang-tidy.mk b/share/mk/lint/c-clang-tidy.mk
index c399d61..eb0a887 100644
--- a/share/mk/lint/c-clang-tidy.mk
+++ b/share/mk/lint/c-clang-tidy.mk
@@ -7,10 +7,11 @@ MAKEFILE_LINT_C_CLANG_TIDY_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/dev-src.mk
-include $(MAKEFILEDIR)/cmd.mk
 include $(MAKEFILEDIR)/configure/cc.mk
 include $(MAKEFILEDIR)/configure/clang-tidy.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/configure/cpp.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 
 
 _TU_h_ct   := $(addsuffix .lint-c.clang-tidy.touch,$(_TU_h))
diff --git a/share/mk/lint/c-cppcheck.mk b/share/mk/lint/c-cppcheck.mk
index 296a2ea..df95d0c 100644
--- a/share/mk/lint/c-cppcheck.mk
+++ b/share/mk/lint/c-cppcheck.mk
@@ -7,7 +7,7 @@ MAKEFILE_LINT_C_CPPCHECK_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/dev-src.mk
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/configure/cppcheck.mk
 include $(MAKEFILEDIR)/src.mk
 
diff --git a/share/mk/lint/c-cpplint.mk b/share/mk/lint/c-cpplint.mk
index 64b4c70..0522868 100644
--- a/share/mk/lint/c-cpplint.mk
+++ b/share/mk/lint/c-cpplint.mk
@@ -7,8 +7,8 @@ MAKEFILE_LINT_C_CPPLINT_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/dev-src.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/configure/cpplint.mk
-include $(MAKEFILEDIR)/cmd.mk
 
 
 _TU_h_cpl  := $(addsuffix .lint-c.cpplint.touch,$(_TU_h))
diff --git a/share/mk/lint/c-iwyu.mk b/share/mk/lint/c-iwyu.mk
index 11b1b1c..e7e844d 100644
--- a/share/mk/lint/c-iwyu.mk
+++ b/share/mk/lint/c-iwyu.mk
@@ -7,11 +7,11 @@ MAKEFILE_LINT_C_IWYU_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/dev-src.mk
-include $(MAKEFILEDIR)/cmd.mk
 include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
 include $(MAKEFILEDIR)/configure/cpp.mk
 include $(MAKEFILEDIR)/configure/iwyu.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/sed.mk
 
 
 _TU_h_iwyu := $(addsuffix .lint-c.iwyu.touch,$(_TU_h))
diff --git a/share/mk/src.mk b/share/mk/src.mk
index b463069..0a270b2 100644
--- a/share/mk/src.mk
+++ b/share/mk/src.mk
@@ -6,7 +6,9 @@ ifndef MAKEFILE_SRC_INCLUDED
 MAKEFILE_SRC_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/configure/findutils.mk
+include $(MAKEFILEDIR)/configure/grep.mk
 include $(MAKEFILEDIR)/version.mk
 
 
diff --git a/share/mk/version.mk b/share/mk/version.mk
index f32265a..e5f0a22 100644
--- a/share/mk/version.mk
+++ b/share/mk/version.mk
@@ -6,7 +6,8 @@ ifndef MAKEFILE_VERSION_INCLUDED
 MAKEFILE_VERSION_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/cmd.mk
+include $(MAKEFILEDIR)/configure/coreutils.mk
+include $(MAKEFILEDIR)/configure/git.mk
 include $(MAKEFILEDIR)/verbose.mk