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 29276f56faa13d8818b525a12464e34f8024daa9..db6023a098df44fbdadef51708dfa323e2e1f492 100644 (file)
--- 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 fad72eb646d71a185f055f913d443d918ee64fc6..412a1f6b0b17d89d756c7d84223399d199970150 100644 (file)
--- 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 b47a5a7561e97562eb944b95922d964a7eeba016..502b8c531c562abbaf45067e3b4868376e7cc429 100644 (file)
--- 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 6c40a6e6478a43bb592641dfccee8b0b95f34fc6..a37005f554947f23fd4f03a8edc8f9ce4737dc7d 100644 (file)
--- 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 97f839e6d1c9909d46346a05dd054108f904fff8..f01b1e7eef13316d9a83f5f07e21254ef4f5ffdf 100644 (file)
--- 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 082c4fe44e31eb5fd45038aca33f754df653f882..c097b1aa886128b2c87c3e93129e25eecae08b54 100644 (file)
--- 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 55fa5e1f557ad26c6273c0ecdff72e0f1397c459..1fb15c79a24a2e15b71d0d3201e1eea94cad0f9c 100644 (file)
--- 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 (file)
index 0000000..e9df9a7
--- /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