share/mk/: Reorganize build system

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

diff --git a/share/mk/build/_.mk b/share/mk/build/_.mk
index 8ced9405f5b65463e55f091374352ad96fb3c58d..4c815461c7f3f98760b58fdf1442361b5678987d 100644 (file)
--- a/share/mk/build/_.mk
+++ b/share/mk/build/_.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_BUILD_INCLUDED
 MAKEFILE_BUILD_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 
 
 _MANDIR := $(builddir)/man

diff --git a/share/mk/build/book.mk b/share/mk/build/book.mk
index 5ccb75eab02711556d76df5e451990c891c13de7..3bebefadb3c529c63c7a4ba5c967fd83b1ebac75 100644 (file)
--- a/share/mk/build/book.mk
+++ b/share/mk/build/book.mk
@@ -17,7 +17,6 @@ include $(MAKEFILEDIR)/configure/build-depends/groff-base/tbl.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
 include $(MAKEFILEDIR)/configure/build-depends/moreutils/sponge.mk
 include $(MAKEFILEDIR)/configure/version.mk
-include $(MAKEFILEDIR)/src.mk
 
 
 LMBDIR   := $(CURDIR)/scripts/LinuxManBook

diff --git a/share/mk/build/catman/troff.mk b/share/mk/build/catman/troff.mk
index a1152411969e44a2c84be9236a83186d17ab3738..f7ef10ae3c5da57dfe70620bcbc241f909b4692d 100644 (file)
--- a/share/mk/build/catman/troff.mk
+++ b/share/mk/build/catman/troff.mk
@@ -7,13 +7,13 @@ MAKEFILE_BUILD_CATMAN_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/nroff.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
-include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/src.mk
 
 
 _XFAIL_CATMAN_MAN_set := \
@@ -50,8 +50,8 @@ _XFAIL_CATMAN_MAN_set := \
 troff_man_ignore_grep := $(MAKEFILEDIR)/build/catman/troff.ignore.grep
 
 
-_CATMAN_MAN_set  := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MAN))
-_CATMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.cat.set,$(NONSO_MDOC))
+_CATMAN_MAN_set  := $(patsubst %, %.cat.set, $(_NONSO_MAN))
+_CATMAN_MDOC_set := $(patsubst %, %.cat.set, $(_NONSO_MDOC))
 
 
 ifeq ($(SKIP_XFAIL),yes)

diff --git a/share/mk/build/examples/_.mk b/share/mk/build/examples/_.mk
index 35f86d6c6ed14788b70efdb74dee7a41e2fcf444..f1e51e6e4272a14faaba2301a47a646590557a57 100644 (file)
--- a/share/mk/build/examples/_.mk
+++ b/share/mk/build/examples/_.mk
@@ -2,22 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_BUILD_EX_DIR_INCLUDED
-MAKEFILE_BUILD_EX_DIR_INCLUDED := 1
-
-
-include $(MAKEFILEDIR)/build/man/man.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils/mkdir.mk
-include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
-
-
-_PAGEEXDIRS := $(patsubst %, %.d/, $(_NONSO_MAN))
-
-
-$(_PAGEEXDIRS):
-       +$(info $(INFO_)MKDIR           $@)
-       +$(MKDIR) -p $@
-       +$(TOUCH) $@
+ifndef MAKEFILE_BUILD_EX_INCLUDED
+MAKEFILE_BUILD_EX_INCLUDED := 1
 
 
 .PHONY: build-ex

diff --git a/share/mk/build/examples/cc.mk b/share/mk/build/examples/cc.mk
index 2daaddb0f7f871535f801a7ad1e1c32e0cbafd25..61f1473ce783de0cde45af4cce2b5628a2ce3e75 100644 (file)
--- a/share/mk/build/examples/cc.mk
+++ b/share/mk/build/examples/cc.mk
@@ -13,7 +13,7 @@ include $(MAKEFILEDIR)/configure/build-depends/cpp/cpp.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
 
 
-_XFAIL_UNITS_ex_o := \
+_XFAIL_EX_TU_o := \
        $(_MANDIR)/man2/bpf.2.d/bpf.o \
        $(_MANDIR)/man2/seccomp.2.d/seccomp.o \
        $(_MANDIR)/man2/sigaction.2.d/sigaction.o \
@@ -36,19 +36,19 @@ _XFAIL_UNITS_ex_o := \
        $(_MANDIR)/man3head/printf.h.3head.d/register_printf_specifier.o
 
 
-_UNITS_ex_o := $(patsubst %.c,%.o,$(_UNITS_ex_c))
+_EX_TU_o := $(patsubst %.c,%.o,$(_EX_TU_c))
 ifeq ($(SKIP_XFAIL),yes)
-_UNITS_ex_o := $(filter-out $(_XFAIL_UNITS_ex_o), $(_UNITS_ex_o))
+_EX_TU_o := $(filter-out $(_XFAIL_EX_TU_o), $(_EX_TU_o))
 endif
 
 
-$(_UNITS_ex_o): %.o: %.c $(MK)
+$(_EX_TU_o): %.o: %.c $(MK)
        $(info  $(INFO_)CC              $@)
        $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $<
 
 
 .PHONY: build-ex-cc
-build-ex-cc:  $(_UNITS_ex_o);
+build-ex-cc:  $(_EX_TU_o);
 
 
 endif  # include guard

diff --git a/share/mk/build/examples/dir.mk b/share/mk/build/examples/dir.mk
new file mode 100644 (file)
index 0000000..8aaaad3
--- /dev/null
+++ b/share/mk/build/examples/dir.mk
@@ -0,0 +1,27 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_BUILD_EX_DIR_INCLUDED
+MAKEFILE_BUILD_EX_DIR_INCLUDED := 1
+
+
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/mkdir.mk
+include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
+
+
+_PAGEEXDIRS := $(patsubst %, %.d/, $(_NONSO_MAN))
+
+
+$(_PAGEEXDIRS):
+       +$(info $(INFO_)MKDIR           $@)
+       +$(MKDIR) -p $@
+       +$(TOUCH) $@
+
+
+.PHONY: build-ex-dir
+build-ex-dir: $(_PAGEEXDIRS);
+
+
+endif  # include guard

diff --git a/share/mk/build/examples/ld.mk b/share/mk/build/examples/ld.mk
index 968865ad71646819407a0705223d07cf624c31cf..5bb914cc6d474369d9b53aba92fee883a1b7efbf 100644 (file)
--- a/share/mk/build/examples/ld.mk
+++ b/share/mk/build/examples/ld.mk
@@ -12,7 +12,7 @@ include $(MAKEFILEDIR)/configure/build-depends/binutils/ld.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
 
 
-_XFAIL_UNITS_ex_bin := \
+_XFAIL_EX_TU_bin := \
        $(_MANDIR)/man2/add_key.2.d/add_key \
        $(_MANDIR)/man2/keyctl.2.d/key_instantiate \
        $(_MANDIR)/man2/request_key.2.d/t_request_key \
@@ -33,19 +33,19 @@ _XFAIL_UNITS_ex_bin := \
        $(_MANDIR)/man3/tsearch.3.d/tsearch
 
 
-_UNITS_ex_bin := $(patsubst %.o,%,$(_UNITS_ex_o))
+_EX_TU_bin := $(patsubst %.o,%,$(_EX_TU_o))
 ifeq ($(SKIP_XFAIL),yes)
-_UNITS_ex_bin := $(filter-out $(_XFAIL_UNITS_ex_bin), $(_UNITS_ex_bin))
+_EX_TU_bin := $(filter-out $(_XFAIL_EX_TU_bin), $(_EX_TU_bin))
 endif
 
 
-$(_UNITS_ex_bin): %: %.o $(MK)
+$(_EX_TU_bin): %: %.o $(MK)
        $(info  $(INFO_)LD              $@)
        $(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
 
 .PHONY: build-ex-ld
-build-ex-ld: $(_UNITS_ex_bin);
+build-ex-ld: $(_EX_TU_bin);
 
 
 endif  # include guard

diff --git a/share/mk/build/examples/src.mk b/share/mk/build/examples/src.mk
index 9329963c980f479a4b6d5741b2366c2c24645a2d..37c5d39a00c147e2eeb8a3343e63cd2bafa4847d 100644 (file)
--- a/share/mk/build/examples/src.mk
+++ b/share/mk/build/examples/src.mk
@@ -13,11 +13,11 @@ include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/mandoc/mandoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
+include $(MAKEFILEDIR)/src/sortman.mk
 
 
-_UNITS_ex_src := \
+_EX_TU_src := \
        $(patsubst $(MANDIR)/%, $(_MANDIR)/%, \
                $(shell \
                        $(FIND) $(MANDIR)/* -type f \
@@ -29,13 +29,13 @@ _UNITS_ex_src := \
                        | $(SED) 's,:,\\:,g' \
                ) \
        )
-_UNITS_ex_h := $(filter %.h,$(_UNITS_ex_src))
-_UNITS_ex_c := $(filter %.c,$(_UNITS_ex_src))
+_EX_TU_h := $(filter %.h,$(_EX_TU_src))
+_EX_TU_c := $(filter %.c,$(_EX_TU_src))
 
 
-$(_UNITS_ex_src): $$(patsubst %.d, %, $$(@D)) $(MK) | $$(@D)/
-$(_UNITS_ex_c):   $$(filter $$(@D)/%.h,$(_UNITS_ex_h))
-$(_UNITS_ex_src):
+$(_EX_TU_src): $$(patsubst %.d, %, $$(@D)) $(MK) | $$(@D)/
+$(_EX_TU_c):   $$(filter $$(@D)/%.h,$(_EX_TU_h))
+$(_EX_TU_src):
        $(info  $(INFO_)SED             $@)
        <$< \
        $(SED) -n \
@@ -50,7 +50,7 @@ $(_UNITS_ex_src):
 
 
 .PHONY: build-ex-src
-build-ex-src: $(_UNITS_ex_src);
+build-ex-src: $(_EX_TU_src);
 
 
 endif  # include guard

diff --git a/share/mk/build/html/troff.mk b/share/mk/build/html/troff.mk
index 937c3c244cbc0579ecd9bd97c926bbf3a2f2994a..e2436dab21bacbe5009e868fa073840cd3e49d04 100644 (file)
--- a/share/mk/build/html/troff.mk
+++ b/share/mk/build/html/troff.mk
@@ -11,9 +11,7 @@ include $(MAKEFILEDIR)/build/man/man.mk
 include $(MAKEFILEDIR)/build/man/mdoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
-include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/src.mk
 
 
 _XFAIL_HTMLMAN_MAN_set := \

diff --git a/share/mk/build/man/_.mk b/share/mk/build/man/_.mk
index bfe735621934b542434d5ddf6b7cb54a269ac45c..cbe1de37930a61d8579e114deef2b26c8c636c58 100644 (file)
--- a/share/mk/build/man/_.mk
+++ b/share/mk/build/man/_.mk
@@ -7,8 +7,8 @@ MAKEFILE_BUILD_MAN_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/configure/src.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
+include $(MAKEFILEDIR)/src/man.mk
 
 
 _MANPAGES := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(MANPAGES))

diff --git a/share/mk/build/man/man.mk b/share/mk/build/man/man.mk
index 4978329ead7c2cdfaba8b825e2d8bf96f3911c33..b15ea0d5222ea9860216ea013ec89ffadb3f0b60 100644 (file)
--- a/share/mk/build/man/man.mk
+++ b/share/mk/build/man/man.mk
@@ -9,10 +9,10 @@ MAKEFILE_BUILD_MAN_MAN_INCLUDED := 1
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/git/git.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
-include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 include $(MAKEFILEDIR)/configure/verbose.mk
 include $(MAKEFILEDIR)/configure/version.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/src/man.mk
 
 
 _NONSO_MAN := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(NONSO_MAN))

diff --git a/share/mk/build/man/mdoc.mk b/share/mk/build/man/mdoc.mk
index dba6f8867815142b87db5f642948016f0c460232..271a0a68519f268192143f8073b992344b7c78d3 100644 (file)
--- a/share/mk/build/man/mdoc.mk
+++ b/share/mk/build/man/mdoc.mk
@@ -8,8 +8,8 @@ MAKEFILE_BUILD_MAN_MDOC_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk
-include $(MAKEFILEDIR)/configure/src.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
+include $(MAKEFILEDIR)/src/man.mk
 
 
 _NONSO_MDOC := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(NONSO_MDOC))

diff --git a/share/mk/build/man/so.mk b/share/mk/build/man/so.mk
index ceb28b90d104308892f01c3b4ebaf43d03252927..6ff1e90fea73969333e1a184c6410b0738f50243 100644 (file)
--- a/share/mk/build/man/so.mk
+++ b/share/mk/build/man/so.mk
@@ -8,8 +8,8 @@ MAKEFILE_BUILD_MAN_SO_INCLUDED := 1
 
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/cp.mk
-include $(MAKEFILEDIR)/configure/src.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
+include $(MAKEFILEDIR)/src/man.mk
 
 
 _SO_MAN := $(patsubst $(MANDIR)/%, $(_MANDIR)/%, $(SO_MAN))

diff --git a/share/mk/build/pdf/troff.mk b/share/mk/build/pdf/troff.mk
index da110d849db8d6e1643875344b689657f24f2857..54519df2d399a298c9f06410d7c9f7ac10eb4e4c 100644 (file)
--- a/share/mk/build/pdf/troff.mk
+++ b/share/mk/build/pdf/troff.mk
@@ -7,11 +7,11 @@ MAKEFILE_BUILD_PDF_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
-include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/src.mk
 
 
 _XFAIL_PDFMAN_MAN_set := \
@@ -42,8 +42,8 @@ _XFAIL_PDFMAN_MAN_set := \
        $(_MANDIR)/man7/vdso.7.pdf.set
 
 
-_PDFMAN_MAN_set  := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.pdf.set,$(NONSO_MAN))
-_PDFMAN_MDOC_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.pdf.set,$(NONSO_MDOC))
+_PDFMAN_MAN_set  := $(patsubst %, %.pdf.set, $(_NONSO_MAN))
+_PDFMAN_MDOC_set := $(patsubst %, %.pdf.set, $(_NONSO_MDOC))
 
 
 ifeq ($(SKIP_XFAIL),yes)

diff --git a/share/mk/build/ps/troff.mk b/share/mk/build/ps/troff.mk
index e4c89cae3c2243a11f59ce7919d089a5e40c004f..c868c2ce7aa89641dbeab910bfc2a28790a5a89f 100644 (file)
--- a/share/mk/build/ps/troff.mk
+++ b/share/mk/build/ps/troff.mk
@@ -7,11 +7,11 @@ MAKEFILE_BUILD_PS_TROFF_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/build/_.mk
+include $(MAKEFILEDIR)/build/man/man.mk
+include $(MAKEFILEDIR)/build/man/mdoc.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/groff-base/troff.mk
-include $(MAKEFILEDIR)/configure/src.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/src.mk
 
 
 _XFAIL_PSMAN_MAN_set := \
@@ -42,8 +42,8 @@ _XFAIL_PSMAN_MAN_set := \
        $(_MANDIR)/man7/vdso.7.ps.set
 
 
-_PSMAN_MAN_set := $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MAN))
-_PSMAN_MDOC_set:= $(patsubst $(MANDIR)/%,$(_MANDIR)/%.ps.set,$(NONSO_MDOC))
+_PSMAN_MAN_set  := $(patsubst %, %.ps.set, $(_NONSO_MAN))
+_PSMAN_MDOC_set := $(patsubst %, %.ps.set, $(_NONSO_MDOC))
 
 
 ifeq ($(SKIP_XFAIL),yes)

diff --git a/share/mk/clean.mk b/share/mk/clean.mk
index a8f42b19b323dee8ed8ca952e9fd222753fb7763..86a19d86e95c23edd31d024fbe36f4e528319cd6 100644 (file)
--- a/share/mk/clean.mk
+++ b/share/mk/clean.mk
@@ -7,7 +7,7 @@ MAKEFILE_CLEAN_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/rm.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/directory_variables/install.mk
 
 
 .PHONY: clean

diff --git a/share/mk/configure/build-depends/checkpatch/checkpatch.mk b/share/mk/configure/build-depends/checkpatch/checkpatch.mk
index bf78d0e3392f951ebf11898ab9442c89d5244043..7100411fee8a009f385dec628e1e00bc93ac32b1 100644 (file)
--- a/share/mk/configure/build-depends/checkpatch/checkpatch.mk
+++ b/share/mk/configure/build-depends/checkpatch/checkpatch.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_CHECKPATCH_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CHECKPATCH_CHECKPATCH_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 
 
 CHECKPATCH_CONF         := $(SYSCONFDIR)/checkpatch/checkpatch.conf

diff --git a/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk
index 0fb9fc825122ea17c1e878f981a67cfea1f4f016..809215da425208d80913a2142d425e367fc2e69c 100644 (file)
--- a/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk
+++ b/share/mk/configure/build-depends/clang-tidy/clang-tidy.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_CLANG_TIDY_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CLANG_TIDY_CLANG_TIDY_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 
 
 CLANG_TIDY_CONF         := $(SYSCONFDIR)/clang-tidy/config.yaml

diff --git a/share/mk/configure/build-depends/cppcheck/cppcheck.mk b/share/mk/configure/build-depends/cppcheck/cppcheck.mk
index 739b4e9e23e5476eb867abb454a895df4726a5b3..bf0c57a45561f6b5d11e1ce539cb21f969810016 100644 (file)
--- a/share/mk/configure/build-depends/cppcheck/cppcheck.mk
+++ b/share/mk/configure/build-depends/cppcheck/cppcheck.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_CPPCHECK_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPCHECK_CPPCHECK_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 
 
 CPPCHECK_SUPPRESS     := $(SYSCONFDIR)/cppcheck/cppcheck.suppress

diff --git a/share/mk/configure/build-depends/cpplint/cpplint.mk b/share/mk/configure/build-depends/cpplint/cpplint.mk
index 42e20e3a5325a5eea2e4f0fcd7473ce683b99441..330315ffa95c006e3b1062c845c1eb00d6df51d5 100644 (file)
--- a/share/mk/configure/build-depends/cpplint/cpplint.mk
+++ b/share/mk/configure/build-depends/cpplint/cpplint.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_CPPLINT_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_CPPLINT_CPPLINT_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/configure/src.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 
 
 CPPLINT_CONF         := $(SYSCONFDIR)/cpplint/cpplint.cfg

diff --git a/share/mk/configure/build-depends/pkgconf/pkgconf.mk b/share/mk/configure/build-depends/pkgconf/pkgconf.mk
index efe75db20abfb969631ecaac1f068bb66dd051c4..f6bc8855dd3feb7908c4ab6bf199bd9633ea40d5 100644 (file)
--- a/share/mk/configure/build-depends/pkgconf/pkgconf.mk
+++ b/share/mk/configure/build-depends/pkgconf/pkgconf.mk
@@ -6,10 +6,6 @@ ifndef MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED
 MAKEFILE_CONFIGURE_BUILD_DEPENDS_PKGCONF_PKGCONF_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/src.mk
-include $(MAKEFILEDIR)/configure/version.mk
-
-
 # Compat
 PKG_CONFIG := pkgconf
 

diff --git a/share/mk/configure/directory_variables/build.mk b/share/mk/configure/directory_variables/build.mk
new file mode 100644 (file)
index 0000000..e31da03
--- /dev/null
+++ b/share/mk/configure/directory_variables/build.mk
@@ -0,0 +1,12 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_BUILD_INCLUDED
+MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_BUILD_INCLUDED := 1
+
+
+builddir := .tmp
+
+
+endif  # include guard

diff --git a/share/mk/configure/directory_variables.mk b/share/mk/configure/directory_variables/install.mk
similarity index 75%
rename from share/mk/configure/directory_variables.mk
rename to share/mk/configure/directory_variables/install.mk
index e4ee6162bda06919df337e1b2294af689330070e..bfab361dd6360cc2bdf108d0c15eb7109cca9950 100644 (file)
--- a/share/mk/configure/directory_variables.mk
+++ b/share/mk/configure/directory_variables/install.mk
@@ -2,14 +2,11 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INCLUDED
-MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED
+MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_INSTALL_INCLUDED := 1
 
 
-include $(MAKEFILEDIR)/src.mk
-
-
-builddir := .tmp
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
 
 
 DESTDIR     :=

diff --git a/share/mk/configure/src.mk b/share/mk/configure/directory_variables/src.mk
similarity index 54%
rename from share/mk/configure/src.mk
rename to share/mk/configure/directory_variables/src.mk
index 2a24f4e9d6d875f1e76b54b9f99e35ea08755f68..2d0513c2ff7a36f2e5ab63062403c8c9e2d3b67d 100644 (file)
--- a/share/mk/configure/src.mk
+++ b/share/mk/configure/directory_variables/src.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_CONFIGURE_SRC_INCLUDED
-MAKEFILE_CONFIGURE_SRC_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_SRC_INCLUDED
+MAKEFILE_CONFIGURE_DIRECTORY_VARIABLES_SRC_INCLUDED := 1
 
 
 SYSCONFDIR := $(srcdir)/etc
@@ -13,4 +13,8 @@ MANDIR     := $(srcdir)
 MANSECTIONS := $(patsubst $(MANDIR)/man%/, %, $(wildcard $(MANDIR)/man*/))
 
 
+$(foreach s, $(MANSECTIONS),                                                  \
+       $(eval MAN$(s)DIR := $(MANDIR)/man$(s)))
+
+
 endif  # include guard

diff --git a/share/mk/configure/link_pages.mk b/share/mk/configure/man/link_pages.mk
similarity index 78%
rename from share/mk/configure/link_pages.mk
rename to share/mk/configure/man/link_pages.mk
index 52136efff3b28ad9f12b4015159c82958a5f16de..8e9c56c6cfacd72432e22d5a2311706dc0ab4f65 100644 (file)
--- a/share/mk/configure/link_pages.mk
+++ b/share/mk/configure/man/link_pages.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_CONFIGURE_LINK_PAGES_INCLUDED
-MAKEFILE_CONFIGURE_LINK_PAGES_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED
+MAKEFILE_CONFIGURE_MAN_LINK_PAGES_INCLUDED := 1
 
 
 LINK_PAGES := .so

diff --git a/share/mk/configure/z.mk b/share/mk/configure/man/z.mk
similarity index 81%
rename from share/mk/configure/z.mk
rename to share/mk/configure/man/z.mk
index 2eec4370a5467a7a156d9a7e4f5fb426ba2dd966..8328abfd76a5a1da0023b3bacb668c3fa72e189a 100644 (file)
--- a/share/mk/configure/z.mk
+++ b/share/mk/configure/man/z.mk
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_CONFIGURE_Z_INCLUDED
-MAKEFILE_CONFIGURE_Z_INCLUDED := 1
+ifndef MAKEFILE_CONFIGURE_MAN_Z_INCLUDED
+MAKEFILE_CONFIGURE_MAN_Z_INCLUDED := 1
 
 
 Z :=

diff --git a/share/mk/dist/_.mk b/share/mk/dist/_.mk
index 381ea94bfee251baaaf85858743f505f1f9f6635..f79f46510fc6767557ad6bb4cff0a7b137e8138e 100644 (file)
--- a/share/mk/dist/_.mk
+++ b/share/mk/dist/_.mk
@@ -7,7 +7,7 @@ MAKEFILE_DIST_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 
 
 _DISTDIR := $(builddir)/dist

diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk
index a959d13599508a69307ebb09125e2db7a72308b5..7c626762594d5ae9f5c70e4c8ff184f74406e2f0 100644 (file)
--- a/share/mk/dist/check/_.mk
+++ b/share/mk/dist/check/_.mk
@@ -7,7 +7,7 @@ MAKEFILE_DIST_CHECK_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/realpath.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 include $(MAKEFILEDIR)/configure/version.mk
 
 

diff --git a/share/mk/dist/check/diffoscope.mk b/share/mk/dist/check/diffoscope.mk
index 4d9faf7f14a960006024181e53167081d411fd4d..14058cb3c942a070957374475809b21b60be8824 100644 (file)
--- a/share/mk/dist/check/diffoscope.mk
+++ b/share/mk/dist/check/diffoscope.mk
@@ -8,7 +8,7 @@ MAKEFILE_DIST_CHECK_DIFFOSCOPE_INCLUDED := 1
 
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 include $(MAKEFILEDIR)/configure/build-depends/diffoscope/diffoscope.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/directory_variables/build.mk
 include $(MAKEFILEDIR)/dist/check/dist.mk
 include $(MAKEFILEDIR)/dist/tar.mk
 

diff --git a/share/mk/install/html.mk b/share/mk/install/html.mk
index f0745ead48804cb8bcc4d9a0d6685902e6b7561c..f29220c378a2c10fb385939b8147717c5c2e33ae 100644 (file)
--- a/share/mk/install/html.mk
+++ b/share/mk/install/html.mk
@@ -9,15 +9,15 @@ MAKEFILE_INSTALL_HTML_INCLUDED := 1
 include $(MAKEFILEDIR)/build/_.mk
 include $(MAKEFILEDIR)/build/html/post-grohtml.mk
 include $(MAKEFILEDIR)/configure/build-depends/coreutils/install.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
+include $(MAKEFILEDIR)/configure/directory_variables/install.mk
 include $(MAKEFILEDIR)/install/_.mk
 
 
 _htmldir := $(DESTDIR)$(htmldir)
 
 
-_htmlpages      := $(patsubst $(_MANDIR)/%,$(_htmldir)/%,$(_HTMLMAN))
-_htmlpages_rm   := $(addsuffix -rm,$(wildcard $(_htmlpages)))
+_htmlpages    := $(patsubst $(_MANDIR)/%,$(_htmldir)/%,$(_HTMLMAN))
+_htmlpages_rm := $(addsuffix -rm,$(wildcard $(_htmlpages)))
 
 
 $(_htmlpages): $(_htmldir)/%: $(_MANDIR)/% $(MK) | $$(@D)/

diff --git a/share/mk/install/man.mk b/share/mk/install/man.mk
index 05e5bf43a588c8eb3601a6e2c8c1e2b1a51e9359..e4e0c22626a0591599036c6d150c2d3648cb8cef 100644 (file)
--- a/share/mk/install/man.mk
+++ b/share/mk/install/man.mk
@@ -17,10 +17,12 @@ include $(MAKEFILEDIR)/configure/build-depends/lzip/lzip.mk
 include $(MAKEFILEDIR)/configure/build-depends/moreutils/sponge.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
 include $(MAKEFILEDIR)/configure/build-depends/xz-utils/xz.mk
-include $(MAKEFILEDIR)/configure/directory_variables.mk
-include $(MAKEFILEDIR)/configure/z.mk
+include $(MAKEFILEDIR)/configure/directory_variables/install.mk
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
+include $(MAKEFILEDIR)/configure/man/link_pages.mk
+include $(MAKEFILEDIR)/configure/man/z.mk
 include $(MAKEFILEDIR)/install/_.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/src/man.mk
 
 
 _mandir := $(DESTDIR)$(mandir)

diff --git a/share/mk/lint/c/checkpatch.mk b/share/mk/lint/c/checkpatch.mk
index 92844269fa4c31b80a5c4040396fe675f8f15360..e09cbc007571ae5e008644b023f92763ac7eefae 100644 (file)
--- a/share/mk/lint/c/checkpatch.mk
+++ b/share/mk/lint/c/checkpatch.mk
@@ -16,7 +16,7 @@ include $(MAKEFILEDIR)/configure/xfail.mk
 _XFAIL_LINT_c_checkpatch := $(_MANDIR)/man2/bpf.2.d/bpf.lint-c.checkpatch.touch
 
 
-_LINT_c_checkpatch := $(patsubst %.c, %.lint-c.checkpatch.touch, $(_UNITS_ex_c))
+_LINT_c_checkpatch := $(patsubst %.c, %.lint-c.checkpatch.touch, $(_EX_TU_c))
 ifeq ($(SKIP_XFAIL),yes)
 _LINT_c_checkpatch := $(filter-out $(_XFAIL_LINT_c_checkpatch), $(_LINT_c_checkpatch))
 endif

diff --git a/share/mk/lint/c/clang-tidy.mk b/share/mk/lint/c/clang-tidy.mk
index 8b435bdfe5e58ea1089bca98eb8a73bd15aab86e..5985d7cfa72300cbdf5b4f515ddd9432241b2896 100644 (file)
--- a/share/mk/lint/c/clang-tidy.mk
+++ b/share/mk/lint/c/clang-tidy.mk
@@ -168,7 +168,7 @@ _XFAIL_LINT_c_clang_tidy := \
        $(_MANDIR)/man3head/printf.h.3head.d/register_printf_specifier.lint-c.clang-tidy.touch
 
 
-_LINT_c_clang_tidy := $(patsubst %.c, %.lint-c.clang-tidy.touch, $(_UNITS_ex_c))
+_LINT_c_clang_tidy := $(patsubst %.c, %.lint-c.clang-tidy.touch, $(_EX_TU_c))
 ifeq ($(SKIP_XFAIL),yes)
 _LINT_c_clang_tidy := $(filter-out $(_XFAIL_LINT_c_clang_tidy), $(_LINT_c_clang_tidy))
 endif

diff --git a/share/mk/lint/c/cppcheck.mk b/share/mk/lint/c/cppcheck.mk
index 87c5ee47c01c5d6d736111ba3bd72cf1a31d267d..63ff01103012e5697221a9fadb9ab62d23d60dae 100644 (file)
--- a/share/mk/lint/c/cppcheck.mk
+++ b/share/mk/lint/c/cppcheck.mk
@@ -55,7 +55,7 @@ _XFAIL_LINT_c_cppcheck := \
        $(_MANDIR)/man3/tsearch.3.d/tsearch.lint-c.cppcheck.touch
 
 
-_LINT_c_cppcheck := $(patsubst %.c, %.lint-c.cppcheck.touch, $(_UNITS_ex_c))
+_LINT_c_cppcheck := $(patsubst %.c, %.lint-c.cppcheck.touch, $(_EX_TU_c))
 ifeq ($(SKIP_XFAIL),yes)
 _LINT_c_cppcheck := $(filter-out $(_XFAIL_LINT_c_cppcheck), $(_LINT_c_cppcheck))
 endif

diff --git a/share/mk/lint/c/cpplint.mk b/share/mk/lint/c/cpplint.mk
index 7f360429492d40d5017982c9b32db276f3143359..2002245d43de73b3da598d0b4e42cf3867c80066 100644 (file)
--- a/share/mk/lint/c/cpplint.mk
+++ b/share/mk/lint/c/cpplint.mk
@@ -11,7 +11,7 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils/touch.mk
 include $(MAKEFILEDIR)/configure/build-depends/cpplint/cpplint.mk
 
 
-_LINT_c_cpplint := $(patsubst %.c, %.lint-c.cpplint.touch, $(_UNITS_ex_c))
+_LINT_c_cpplint := $(patsubst %.c, %.lint-c.cpplint.touch, $(_EX_TU_c))
 
 
 $(_LINT_c_cpplint): %.lint-c.cpplint.touch: %.c $(CPPLINT_CONF) $(MK)

diff --git a/share/mk/lint/c/iwyu.mk b/share/mk/lint/c/iwyu.mk
index c4c7e920f110971b99d91f01e927a18028ba69ce..4c717aa7ef7d20977b112f673c08a7f6a8ef1f53 100644 (file)
--- a/share/mk/lint/c/iwyu.mk
+++ b/share/mk/lint/c/iwyu.mk
@@ -85,7 +85,7 @@ _XFAIL_LINT_c_iwyu := \
        $(_MANDIR)/man3/slist.3.d/slist.lint-c.iwyu.touch
 
 
-_LINT_c_iwyu := $(patsubst %.c, %.lint-c.iwyu.touch, $(_UNITS_ex_c))
+_LINT_c_iwyu := $(patsubst %.c, %.lint-c.iwyu.touch, $(_EX_TU_c))
 ifeq ($(SKIP_XFAIL),yes)
 _LINT_c_iwyu := $(filter-out $(_XFAIL_LINT_c_iwyu), $(_LINT_c_iwyu))
 endif

diff --git a/share/mk/lint/man/mandoc.mk b/share/mk/lint/man/mandoc.mk
index 7aa992c4818fd3c920f03fbb964a88ea162919c8..d4dc753fd20ff252b1da3278b354294e1d2da462 100644 (file)
--- a/share/mk/lint/man/mandoc.mk
+++ b/share/mk/lint/man/mandoc.mk
@@ -13,7 +13,7 @@ include $(MAKEFILEDIR)/configure/build-depends/coreutils/true.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/mandoc/mandoc.mk
 include $(MAKEFILEDIR)/configure/xfail.mk
-include $(MAKEFILEDIR)/src.mk
+include $(MAKEFILEDIR)/src/man.mk
 
 
 _XFAIL_LINT_man_mandoc := \

diff --git a/share/mk/src.mk b/share/mk/src/man.mk
similarity index 81%
rename from share/mk/src.mk
rename to share/mk/src/man.mk
index 92eb0736646266cc9e129c8dc5d4e55a64b74dcb..424655f0c519710d73c071603d486b5b6888770e 100644 (file)
--- a/share/mk/src.mk
+++ b/share/mk/src/man.mk
@@ -2,18 +2,16 @@
 # SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
 
 
-ifndef MAKEFILE_SRC_INCLUDED
-MAKEFILE_SRC_INCLUDED := 1
+ifndef MAKEFILE_SRC_MAN_INCLUDED
+MAKEFILE_SRC_MAN_INCLUDED := 1
 
 
 include $(MAKEFILEDIR)/configure/build-depends/findutils/find.mk
 include $(MAKEFILEDIR)/configure/build-depends/findutils/xargs.mk
 include $(MAKEFILEDIR)/configure/build-depends/grep/grep.mk
 include $(MAKEFILEDIR)/configure/build-depends/sed/sed.mk
-include $(MAKEFILEDIR)/configure/src.mk
-
-
-SORTMAN := $(CURDIR)/scripts/sortman
+include $(MAKEFILEDIR)/configure/directory_variables/src.mk
+include $(MAKEFILEDIR)/src/sortman.mk
 
 
 MANEXT := \(\.[[:digit:]]\([[:alpha:]][[:alnum:]]*\)\?\>\|\.man\)\+\(\.man\|\.in\)*$
@@ -32,18 +30,15 @@ MANINTROPAGES := $(shell $(FIND) $(MANDIR)/* -type f \
                | $(SED) 's,:,\\:,g')
 
 
-$(foreach s, $(MANSECTIONS),                                                  \
-       $(eval MAN$(s)DIR := $(MANDIR)/man$(s)))
-
 $(foreach s, $(MANSECTIONS),                                                  \
        $(eval MAN$(s)PAGES :=                                                \
                $(filter-out $(MANINTROPAGES),                                \
-                       $(filter $(MANDIR)/man$(s)/%,                         \
+                       $(filter $(MAN$(s)DIR)/%,                             \
                                $(filter %.$(s),                              \
                                        $(MANPAGES))))))
 $(foreach s, $(MANSECTIONS),                                                  \
        $(eval MAN$(s)INTROPAGE :=                                            \
-               $(filter $(MANDIR)/man$(s)/%,                                 \
+               $(filter $(MAN$(s)DIR)/%,                                     \
                        $(filter %.$(s),                                      \
                                $(MANINTROPAGES)))))
 

diff --git a/share/mk/src/sortman.mk b/share/mk/src/sortman.mk
new file mode 100644 (file)
index 0000000..730274b
--- /dev/null
+++ b/share/mk/src/sortman.mk
@@ -0,0 +1,12 @@
+# Copyright 2021-2024, Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_SRC_SORTMAN_INCLUDED
+MAKEFILE_SRC_SORTMAN_INCLUDED := 1
+
+
+SORTMAN := $(CURDIR)/scripts/sortman
+
+
+endif  # include guard