diff options
author | Alejandro Colomar <alx@kernel.org> | 2024-02-28 13:44:42 +0100 |
---|---|---|
committer | Alejandro Colomar <alx@kernel.org> | 2024-02-28 16:03:58 +0100 |
commit | d7b3f23c53d83ff714dd829c929a27f2c05aab23 (patch) | |
tree | 1212e61d654ba264c1a731db7f0c58b69e55669e | |
parent | 281f7e720c64a40cb76bde0fc6f3859f25139770 (diff) | |
download | man-pages-d7b3f23c53d83ff714dd829c929a27f2c05aab23.tar.gz |
share/mk/: distcheck: Rewrite most of it
This implementation is simpler.
Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r-- | share/mk/dist/check/_.mk | 16 | ||||
-rw-r--r-- | share/mk/dist/check/all.mk | 34 | ||||
-rw-r--r-- | share/mk/dist/check/build.mk | 91 | ||||
-rw-r--r-- | share/mk/dist/check/check.mk | 38 | ||||
-rw-r--r-- | share/mk/dist/check/dist.mk | 10 | ||||
-rw-r--r-- | share/mk/dist/check/install.mk | 27 | ||||
-rw-r--r-- | share/mk/dist/check/lint.mk | 42 |
7 files changed, 18 insertions, 240 deletions
diff --git a/share/mk/dist/check/_.mk b/share/mk/dist/check/_.mk index aecf97a9eb..9853511a63 100644 --- a/share/mk/dist/check/_.mk +++ b/share/mk/dist/check/_.mk @@ -8,6 +8,7 @@ MAKEFILE_DIST_CHECK_INCLUDED := 1 include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk include $(MAKEFILEDIR)/configure/directory_variables.mk +include $(MAKEFILEDIR)/configure/version.mk _DISTCHECKDIR := $(shell $(REALPATH) -m $(builddir)/distcheck) @@ -20,12 +21,21 @@ _DISTCHECK_MANDIR := $(_DISTCHECKBUILDDIR)/man _MAKE_OPTS = \ -C $< \ 'builddir=$(_DISTCHECKBUILDDIR)' \ - 'DESTDIR=$(_DISTCHECKDESTDIR)' \ - 'SKIP_XFAIL=yes' + 'DESTDIR=$(_DISTCHECKDESTDIR)' + + +distcheck-%: $(_DISTCHECKSRCDIR) $(MK) | $$(@D)/ + $(info $(INFO_)MAKE $@) + $(MAKE) $(_MAKE_OPTS) $* \ + 'INFO_= $*: ' .PHONY: distcheck -distcheck: distcheck-all distcheck-install distcheck-diffoscope; +distcheck: distcheck-diffoscope +distcheck: $(_DISTCHECKSRCDIR) $(MK) + $(info $(INFO_)MAKE lint build check install dist) + $(MAKE) $(_MAKE_OPTS) lint build check install dist \ + 'INFO_= distcheck: ' endif # include guard diff --git a/share/mk/dist/check/all.mk b/share/mk/dist/check/all.mk deleted file mode 100644 index 5a6c000d60..0000000000 --- a/share/mk/dist/check/all.mk +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright 2024 Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_DIST_CHECK_ALL_INCLUDED -MAKEFILE_DIST_CHECK_ALL_INCLUDED := 1 - - -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk -include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/_.mk - - -$(builddir)/distcheck.all.touch: \ - $(builddir)/distcheck.check.touch \ - $(builddir)/distcheck.build-ps.touch \ - $(builddir)/distcheck.build-pdf.touch \ - $(builddir)/distcheck.build-html.touch \ - $(builddir)/distcheck.build-book.touch \ - $(builddir)/distcheck.lint-man.touch \ - $(builddir)/distcheck.lint-mdoc.touch -$(builddir)/distcheck.all.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - #$(info $(INFO_)MAKE all) - #$(MAKE) $(_MAKE_OPTS) all \ - # 'INFO_= all: ' - $(TOUCH) $@ - - -.PHONY: distcheck-all -distcheck-all: $(builddir)/distcheck.all.touch; - - -endif # include guard diff --git a/share/mk/dist/check/build.mk b/share/mk/dist/check/build.mk deleted file mode 100644 index 328fac7de9..0000000000 --- a/share/mk/dist/check/build.mk +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 2024 Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_DIST_CHECK_BUILD_INCLUDED -MAKEFILE_DIST_CHECK_BUILD_INCLUDED := 1 - - -include $(MAKEFILEDIR)/build/_.mk -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk -include $(MAKEFILEDIR)/configure/verbose.mk -include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/_.mk -include $(MAKEFILEDIR)/dist/tar.mk - - -$(builddir)/distcheck.build-pre.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE build-pre) - $(MAKE) $(_MAKE_OPTS) build-pre \ - 'INFO_= build-pre: ' - $(TOUCH) $@ - -$(builddir)/distcheck.build-catman.touch: $(builddir)/distcheck.build-pre.touch -$(builddir)/distcheck.build-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE build-catman) - $(MAKE) $(_MAKE_OPTS) build-catman \ - 'INFO_= build-catman: ' - $(TOUCH) $@ - -$(builddir)/distcheck.build-ps.touch: $(builddir)/distcheck.build-pre.touch -$(builddir)/distcheck.build-ps.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE build-ps) - $(MAKE) $(_MAKE_OPTS) build-ps \ - 'INFO_= build-ps: ' - $(TOUCH) $@ - -$(builddir)/distcheck.build-pdf.touch: $(builddir)/distcheck.build-pre.touch -$(builddir)/distcheck.build-pdf.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE build-pdf) - $(MAKE) $(_MAKE_OPTS) build-pdf \ - 'INFO_= build-pdf: ' - $(TOUCH) $@ - -$(builddir)/distcheck.build-html.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE build-html) - $(MAKE) $(_MAKE_OPTS) build-html \ - 'INFO_= build-html: ' - $(TOUCH) $@ - -$(builddir)/distcheck.build-book.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE build-book) - $(MAKE) $(_MAKE_OPTS) -k build-book \ - 'INFO_= build-book -k: ' \ - $(HIDE_ERR) \ - || $(TRUE) - $(MAKE) $(_MAKE_OPTS) build-book \ - 'INFO_= build-book: ' - $(TOUCH) $@ - - -.PHONY: distcheck-build-pre -distcheck-build-pre: $(builddir)/distcheck.build-pre.touch; - -.PHONY: distcheck-build-catman -distcheck-build-catman: $(builddir)/distcheck.build-catman.touch; - -.PHONY: distcheck-build-ps -distcheck-build-ps: $(builddir)/distcheck.build-ps.touch; - -.PHONY: distcheck-build-pdf -distcheck-build-pdf: $(builddir)/distcheck.build-pdf.touch; - -.PHONY: distcheck-build-html -distcheck-build-html: $(builddir)/distcheck.build-html.touch; - -.PHONY: distcheck-build-book -distcheck-build-book: $(builddir)/distcheck.build-book.touch; - - -.PHONY: distcheck-build -distcheck-build: \ - distcheck-build-pre \ - distcheck-build-catman \ - distcheck-build-ps \ - distcheck-build-pdf \ - distcheck-build-html \ - distcheck-build-book; - - -endif # include guard diff --git a/share/mk/dist/check/check.mk b/share/mk/dist/check/check.mk deleted file mode 100644 index 446384d4ef..0000000000 --- a/share/mk/dist/check/check.mk +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2024 Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_DIST_CHECK_CHECK_INCLUDED -MAKEFILE_DIST_CHECK_CHECK_INCLUDED := 1 - - -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/tar.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk -include $(MAKEFILEDIR)/configure/verbose.mk -include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/_.mk - - -$(builddir)/distcheck.check-catman.touch: \ - $(builddir)/distcheck.build-catman.touch -$(builddir)/distcheck.check-catman.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE check-catman) - $(MAKE) $(_MAKE_OPTS) check-catman \ - 'INFO_= check-catman: ' - $(TOUCH) $@ - -$(builddir)/distcheck.check.touch: \ - $(builddir)/distcheck.check-catman.touch -$(builddir)/distcheck.check.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE check) - $(MAKE) $(_MAKE_OPTS) check \ - 'INFO_= check: ' - $(TOUCH) $@ - - -.PHONY: distcheck-check -distcheck-check: $(builddir)/distcheck.check.touch; - - -endif # include guard diff --git a/share/mk/dist/check/dist.mk b/share/mk/dist/check/dist.mk index 8891b24408..4cdef026c0 100644 --- a/share/mk/dist/check/dist.mk +++ b/share/mk/dist/check/dist.mk @@ -16,13 +16,13 @@ REDIST := $(_DISTCHECKBUILDDIR)/$(DISTNAME).tar $(REDIST): $(_DISTCHECKSRCDIR) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE dist) - $(MAKE) $(_MAKE_OPTS) dist \ - 'INFO_= dist: ' + $(info $(INFO_)MAKE dist-tar) + $(MAKE) $(_MAKE_OPTS) dist-tar \ + 'INFO_= dist-tar: ' -.PHONY: distcheck-dist -distcheck-dist: $(REDIST); +.PHONY: distcheck-dist-tar +distcheck-dist-tar: $(REDIST); endif # include guard diff --git a/share/mk/dist/check/install.mk b/share/mk/dist/check/install.mk deleted file mode 100644 index ff1fd509b1..0000000000 --- a/share/mk/dist/check/install.mk +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 2024 Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_DIST_CHECK_INSTALL_INCLUDED -MAKEFILE_DIST_CHECK_INSTALL_INCLUDED := 1 - - -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/sed.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk -include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/_.mk - - -$(builddir)/distcheck.install.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE install) - $(MAKE) $(_MAKE_OPTS) install \ - 'INFO_= install: ' - $(TOUCH) $@ - - -.PHONY: distcheck-install -distcheck-install: $(builddir)/distcheck.install.touch; - - -endif # include guard diff --git a/share/mk/dist/check/lint.mk b/share/mk/dist/check/lint.mk deleted file mode 100644 index 2588d5724e..0000000000 --- a/share/mk/dist/check/lint.mk +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2024 Alejandro Colomar <alx@kernel.org> -# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception - - -ifndef MAKEFILE_DIST_CHECK_LINT_INCLUDED -MAKEFILE_DIST_CHECK_LINT_INCLUDED := 1 - - -include $(MAKEFILEDIR)/build/_.mk -include $(MAKEFILEDIR)/configure/build-depends/coreutils.mk -include $(MAKEFILEDIR)/configure/build-depends/sed.mk -include $(MAKEFILEDIR)/configure/directory_variables.mk -include $(MAKEFILEDIR)/configure/verbose.mk -include $(MAKEFILEDIR)/configure/version.mk -include $(MAKEFILEDIR)/dist/check/_.mk - - -$(builddir)/distcheck.lint-man.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE lint-man) - $(MAKE) $(_MAKE_OPTS) lint-man \ - 'INFO_= lint-man: ' - $(TOUCH) $@ - -$(builddir)/distcheck.lint-mdoc.touch: $(_DISTCHECKDIR)/$(DISTNAME) $(MK) | $$(@D)/ - $(info $(INFO_)MAKE lint-mdoc) - $(MAKE) $(_MAKE_OPTS) lint-mdoc \ - 'INFO_= lint-mdoc: ' - $(TOUCH) $@ - - -.PHONY: distcheck-lint-man -distcheck-lint-man: $(builddir)/distcheck.lint-man.touch; - -.PHONY: distcheck-lint-mdoc -distcheck-lint-mdoc: $(builddir)/distcheck.lint-mdoc.touch; - - -.PHONY: distcheck-lint -distcheck-lint: distcheck-lint-man distcheck-lint-mdoc; - - -endif # include guard |