From: Alejandro Colomar <alx.manpages@gmail.com>
Date: Sat, 30 Jul 2022 19:06:53 +0000 (+0200)
Subject: Makefile, src.mk, *.mk: Move some definitions to a helper Makefile
X-Git-Tag: man-pages-6.0-rc1~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb60a7befd2006d5a940fa38da28c08c47ff208a;p=thirdparty%2Fman-pages.git

Makefile, src.mk, *.mk: Move some definitions to a helper Makefile

To be able to explicitly include the file with the definitions,
wherever it is needed.

Signed-off-by: Alejandro Colomar <alx.manpages@gmail.com>
---

diff --git a/Makefile b/Makefile
index 29276f56fa..db6023a098 100644
--- a/Makefile
+++ b/Makefile
@@ -41,17 +41,6 @@ srcdir := .
 include $(srcdir)/lib/cmd.mk
 
 
-MANDIR := $(srcdir)
-MANEXT := \.[0-9]\w*
-
-
-MANPAGES := $(shell $(FIND) $(MANDIR)/man*/ -type f \
-		| $(GREP) '$(MANEXT)' \
-		| $(SORT))
-MANDIRS  := $(shell $(FIND) $(MANDIR)/man* -type d \
-		| $(SORT))
-
-
 .PHONY: all
 all: build
 	@:
diff --git a/lib/build-html.mk b/lib/build-html.mk
index fad72eb646..412a1f6b0b 100644
--- a/lib/build-html.mk
+++ b/lib/build-html.mk
@@ -10,6 +10,7 @@ MAKEFILE_BUILD_HTML_INCLUDED := 1
 
 include $(srcdir)/lib/build.mk
 include $(srcdir)/lib/cmd.mk
+include $(srcdir)/lib/src.mk
 
 
 htmlext  := .html
diff --git a/lib/build-src.mk b/lib/build-src.mk
index b47a5a7561..502b8c531c 100644
--- a/lib/build-src.mk
+++ b/lib/build-src.mk
@@ -11,6 +11,7 @@ MAKEFILE_BUILD_SRC_INCLUDED := 1
 include $(srcdir)/lib/build.mk
 include $(srcdir)/lib/cmd.mk
 include $(srcdir)/lib/lint.mk
+include $(srcdir)/lib/src.mk
 
 
 DEFAULT_CPPFLAGS :=
diff --git a/lib/build.mk b/lib/build.mk
index 6c40a6e647..a37005f554 100644
--- a/lib/build.mk
+++ b/lib/build.mk
@@ -8,6 +8,9 @@ ifndef MAKEFILE_BUILD_INCLUDED
 MAKEFILE_BUILD_INCLUDED := 1
 
 
+include $(srcdir)/lib/src.mk
+
+
 builddir := tmp
 
 _SRCDIR := $(builddir)/src
diff --git a/lib/install-man.mk b/lib/install-man.mk
index 97f839e6d1..f01b1e7eef 100644
--- a/lib/install-man.mk
+++ b/lib/install-man.mk
@@ -9,6 +9,7 @@ MAKEFILE_INSTALL_MAN_INCLUDED := 1
 
 
 include $(srcdir)/lib/install.mk
+include $(srcdir)/lib/src.mk
 
 
 mandir      := $(datarootdir)/man
diff --git a/lib/lint-man.mk b/lib/lint-man.mk
index 082c4fe44e..c097b1aa88 100644
--- a/lib/lint-man.mk
+++ b/lib/lint-man.mk
@@ -10,6 +10,7 @@ MAKEFILE_LINT_MAN_INCLUDED := 1
 
 include $(srcdir)/lib/cmd.mk
 include $(srcdir)/lib/lint.mk
+include $(srcdir)/lib/src.mk
 
 
 TMACDIR := $(SYSCONFDIR)/groff/tmac
diff --git a/lib/lint.mk b/lib/lint.mk
index 55fa5e1f55..1fb15c79a2 100644
--- a/lib/lint.mk
+++ b/lib/lint.mk
@@ -10,6 +10,7 @@ MAKEFILE_LINT_INCLUDED := 1
 
 include $(srcdir)/lib/build.mk
 include $(srcdir)/lib/cmd.mk
+include $(srcdir)/lib/src.mk
 
 
 SYSCONFDIR := $(srcdir)/etc
diff --git a/lib/src.mk b/lib/src.mk
new file mode 100644
index 0000000000..e9df9a75ad
--- /dev/null
+++ b/lib/src.mk
@@ -0,0 +1,25 @@
+########################################################################
+# Copyright (C) 2021, 2022  Alejandro Colomar <alx.manpages@gmail.com>
+# SPDX-License-Identifier:  GPL-2.0  OR  LGPL-2.0
+########################################################################
+
+
+ifndef MAKEFILE_SRC_INCLUDED
+MAKEFILE_SRC_INCLUDED := 1
+
+
+include $(srcdir)/lib/cmd.mk
+
+
+MANDIR := $(srcdir)
+MANEXT := \.[0-9]\w*
+
+
+MANPAGES := $(shell $(FIND) $(MANDIR)/man*/ -type f \
+		| $(GREP) '$(MANEXT)' \
+		| $(SORT))
+MANDIRS  := $(shell $(FIND) $(MANDIR)/man* -type d \
+		| $(SORT))
+
+
+endif  # MAKEFILE_SRC_INCLUDED