Makefile, build.mk, build-html.mk, build-src.mk, dist.mk, lint.mk, lint-man.mk: build...

Add a new 'build' target (alias for 'all'), for consistency.

Also, use MKDIR instead of INSTALL_DIR to create directories in $(builddir).

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

diff --git a/Makefile b/Makefile
index 1a46a49b571a59979a225ea065a8813244bc6d8c..32519a4fd69d2ec55dd6e44cb0b2959c7fa7412e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,9 @@ MAKEFLAGS += --no-print-directory
 MAKEFLAGS += --warn-undefined-variables
 
 
-srcdir   := .
-builddir := tmp
-DESTDIR  :=
-prefix   := /usr/local
+srcdir  := .
+DESTDIR :=
+prefix  := /usr/local
 
 MANDIR  := $(srcdir)
 MAN0DIR := $(MANDIR)/man0
@@ -50,22 +49,20 @@ MAN5DIR := $(MANDIR)/man5
 MAN6DIR := $(MANDIR)/man6
 MAN7DIR := $(MANDIR)/man7
 MAN8DIR := $(MANDIR)/man8
+MANEXT  := \.[0-9]\w*
 
 datarootdir := $(prefix)/share
 docdir      := $(datarootdir)/doc
-manext      := \.[0-9]\w*
 
 
 INSTALL      := install
 INSTALL_DATA := $(INSTALL) -m 644
 INSTALL_DIR  := $(INSTALL) -m 755 -d
-MKDIR        := mkdir -p
-RM           := rm
 RMDIR        := rmdir --ignore-fail-on-non-empty
 
 
 .PHONY: all
-all: build-html
+all: build
 
 %/.:
        $(info INSTALL  $(@D)/)
@@ -92,15 +89,11 @@ installdirs: | installdirs-man
 uninstall remove: uninstall-man
        @:
 
-.PHONY: clean
-clean:
-       $(RM) -rf $(builddir)
-
 
 ########################################################################
 # man
 
-MANPAGES := $(sort $(shell find $(MANDIR)/man?/ -type f | grep '$(manext)'))
+MANPAGES := $(sort $(shell find $(MANDIR)/man?/ -type f | grep '$(MANEXT)'))
 MANDIRS  := $(sort $(shell find $(MANDIR)/man? -type d))
 
 
@@ -108,6 +101,7 @@ MANDIRS  := $(sort $(shell find $(MANDIR)/man? -type d))
 
 
 ########################################################################
+include $(srcdir)/lib/build.mk
 include $(srcdir)/lib/build-html.mk
 include $(srcdir)/lib/build-src.mk
 include $(srcdir)/lib/dist.mk

diff --git a/lib/build-html.mk b/lib/build-html.mk
index 5525443fde386a59432754bb1c3faabd10f30312..7caa8f755b2bae175f1634b6008b665ae3fde7eb 100644 (file)
--- a/lib/build-html.mk
+++ b/lib/build-html.mk
@@ -8,6 +8,9 @@ ifndef MAKEFILE_BUILD_HTML_INCLUDED
 MAKEFILE_BUILD_HTML_INCLUDED := 1
 
 
+include $(srcdir)/lib/build.mk
+
+
 htmlext  := .html
 _HTMLDIR := $(builddir)/html
 

diff --git a/lib/build-src.mk b/lib/build-src.mk
index 290629a9cdfc2d1e62c61eb78dafcadadcf8ca43..2d9bb6d1bba4787f8c98642fb7e75374a0c17dea 100644 (file)
--- a/lib/build-src.mk
+++ b/lib/build-src.mk
@@ -8,6 +8,7 @@ ifndef MAKEFILE_BUILD_SRC_INCLUDED
 MAKEFILE_BUILD_SRC_INCLUDED := 1
 
 
+include $(srcdir)/lib/build.mk
 include $(srcdir)/lib/lint.mk
 
 
@@ -48,7 +49,7 @@ _SRCPAGEDIRS   := $(patsubst $(MANDIR)/%,$(_SRCDIR)/%.d,$(LINTMAN))
 
 _UNITS_src_src := $(sort $(patsubst $(MANDIR)/%,$(_SRCDIR)/%,$(shell \
                find $(MANDIR)/man?/ -type f \
-               | grep '$(manext)$$' \
+               | grep '$(MANEXT)$$' \
                | xargs grep -l '^\.TH ' \
                | while read m; do \
                        <$$m \
@@ -87,8 +88,6 @@ $(_UNITS_src_bin): $(_SRCDIR)/%: $(_SRCDIR)/%.o
        $(info LD       $@)
        $(LD) $(LDFLAGS) -o $@ $< $(LDLIBS)
 
-$(_SRCDIRS): %/.: | $$(dir %). $(_SRCDIR)/.
-
 
 .PHONY: build-src-c
 build-src-c:   $(_UNITS_src_c) | builddirs-src

diff --git a/lib/build.mk b/lib/build.mk
new file mode 100644 (file)
index 0000000..6c40a6e
--- /dev/null
+++ b/lib/build.mk
@@ -0,0 +1,40 @@
+########################################################################
+# Copyright (C) 2021, 2022  Alejandro Colomar <alx.manpages@gmail.com>
+# SPDX-License-Identifier:  GPL-2.0  OR  LGPL-2.0
+########################################################################
+
+
+ifndef MAKEFILE_BUILD_INCLUDED
+MAKEFILE_BUILD_INCLUDED := 1
+
+
+builddir := tmp
+
+_SRCDIR := $(builddir)/src
+
+
+MKDIR := mkdir -p
+RM    := rm
+
+
+_SRCDIRS := $(patsubst $(MANDIR)/%,$(_SRCDIR)/%/.,$(MANDIRS))
+
+
+$(_SRCDIRS): %/.: | $$(dir %). $(_SRCDIR)/.
+
+
+$(builddir)/%/.:
+       $(info MKDIR    $(@D)/)
+       $(MKDIR) $(@D)
+
+
+.PHONY: build
+build: build-html
+       @:
+
+.PHONY: clean
+clean:
+       $(RM) -rf $(builddir)
+
+
+endif  # MAKEFILE_BUILD_INCLUDED

diff --git a/lib/dist.mk b/lib/dist.mk
index 10feb87c68393c1db2ff933bb547b9270d59b034..7798d59a193116fc47937c82c8b0014577170b43 100644 (file)
--- a/lib/dist.mk
+++ b/lib/dist.mk
@@ -8,6 +8,9 @@ ifndef MAKEFILE_DIST_INCLUDED
 MAKEFILE_DIST_INCLUDED := 1
 
 
+include $(srcdir)/lib/build.mk
+
+
 DISTNAME    := $(shell git describe 2>/dev/null)
 DISTFILE    := $(builddir)/$(DISTNAME).tar
 compression := gz xz

diff --git a/lib/lint.mk b/lib/lint.mk
index b3a2dc6b0b674ac8828202236550b1e38bdedb72..6e23b5d978ba8962fbf13ff157dda01c60c677bc 100644 (file)
--- a/lib/lint.mk
+++ b/lib/lint.mk
@@ -8,16 +8,17 @@ ifndef MAKEFILE_LINT_INCLUDED
 MAKEFILE_LINT_INCLUDED := 1
 
 
+include $(srcdir)/lib/build.mk
+
+
 SYSCONFDIR := $(srcdir)/etc
 
 _LINTDIR   := $(builddir)/lint
-_SRCDIR    := $(builddir)/src
 
 
-LINTMAN   := $(shell find $(MANDIR)/man?/ -type f | grep '$(manext)' \
+LINTMAN   := $(shell find $(MANDIR)/man?/ -type f | grep '$(MANEXT)' \
                      | xargs grep -l '^\.TH ' | sort))
 _LINTDIRS := $(patsubst $(MANDIR)/%,$(_LINTDIR)/%/.,$(MANDIRS))
-_SRCDIRS  := $(patsubst $(MANDIR)/%,$(_SRCDIR)/%/.,$(MANDIRS))
 
 
 lint := lint-c lint-man