From: Alejandro Colomar Date: Fri, 14 Apr 2023 13:53:53 +0000 (+0200) Subject: *.mk: Move makefiles from lib/ to share/mk/ X-Git-Tag: man-pages-6.05~183 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=edaa12e6bb7d8c64357a9992fcaa2c815f00fefa;p=thirdparty%2Fman-pages.git *.mk: Move makefiles from lib/ to share/mk/ According to the FHS, lib/ is for arch-dependent files, while share/ is for arch-independent files. While moving, create a more organized directory structure. Signed-off-by: Alejandro Colomar --- diff --git a/Makefile b/Makefile index 62b59dcd54..d55191b4d5 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,9 @@ MAKEFLAGS += --no-print-directory MAKEFLAGS += --warn-undefined-variables -srcdir := . +srcdir := . +DATAROOTDIR := $(srcdir)/share +MAKEFILEDIR := $(DATAROOTDIR)/mk .PHONY: all @@ -115,20 +117,20 @@ help: .SECONDEXPANSION: -include $(srcdir)/lib/check.mk -include $(srcdir)/lib/check-catman.mk -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/build-catman.mk -include $(srcdir)/lib/build-html.mk -include $(srcdir)/lib/build-src.mk -include $(srcdir)/lib/dist.mk -include $(srcdir)/lib/install.mk -include $(srcdir)/lib/install-html.mk -include $(srcdir)/lib/install-man.mk -include $(srcdir)/lib/lint.mk -include $(srcdir)/lib/lint-c.mk -include $(srcdir)/lib/lint-man.mk -include $(srcdir)/lib/verbose.mk +include $(MAKEFILEDIR)/check/_.mk +include $(MAKEFILEDIR)/check/catman.mk +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/build/catman.mk +include $(MAKEFILEDIR)/build/html.mk +include $(MAKEFILEDIR)/build/src.mk +include $(MAKEFILEDIR)/dist.mk +include $(MAKEFILEDIR)/install/_.mk +include $(MAKEFILEDIR)/install/html.mk +include $(MAKEFILEDIR)/install/man.mk +include $(MAKEFILEDIR)/lint/_.mk +include $(MAKEFILEDIR)/lint/c.mk +include $(MAKEFILEDIR)/lint/man.mk +include $(MAKEFILEDIR)/verbose.mk .PHONY: help-variables diff --git a/README b/README index 82794e3480..87248c8dcb 100644 --- a/README +++ b/README @@ -34,7 +34,7 @@ Files Change log. Includes most relevant changes. However, it's not as complete as the git(1) log. - Makefile, lib/*.mk + Makefile, share/mk/* Build system. For help, consult the file, and run 'make help'. lsm diff --git a/RELEASE b/RELEASE index 1738da08bb..1e20718bb9 100644 --- a/RELEASE +++ b/RELEASE @@ -90,7 +90,7 @@ Description In case you're creating a tarball for distributing a random commit, it might be interesting to tweak a few parameters; check - the variables available at , and any makefiles + the variables available at , and any makefiles included by that one. See the "Versions" section below. - Create the tarball: @@ -182,7 +182,7 @@ Files Changes, Changes.old Change log. Includes most relevant changes. - Makefile, lib/dist.mk, lib/version.mk + Makefile, share/mk/dist.mk, share/mk/version.mk Main makefiles used for releasing (however, others may also be used by inclusion). diff --git a/lib/build.mk b/share/mk/build/_.mk similarity index 93% rename from lib/build.mk rename to share/mk/build/_.mk index 2025ebde42..0bd4c949c5 100644 --- a/lib/build.mk +++ b/share/mk/build/_.mk @@ -8,8 +8,8 @@ ifndef MAKEFILE_BUILD_INCLUDED MAKEFILE_BUILD_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/src.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/src.mk builddir := .tmp diff --git a/lib/build-catman.mk b/share/mk/build/catman.mk similarity index 97% rename from lib/build-catman.mk rename to share/mk/build/catman.mk index f689e0b649..8c95931e50 100644 --- a/lib/build-catman.mk +++ b/share/mk/build/catman.mk @@ -8,9 +8,9 @@ ifndef MAKEFILE_BUILD_CATMAN_INCLUDED MAKEFILE_BUILD_CATMAN_INCLUDED := 1 -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/src.mk +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/src.mk TMACDIR := $(SYSCONFDIR)/groff/tmac diff --git a/lib/build-html.mk b/share/mk/build/html.mk similarity index 91% rename from lib/build-html.mk rename to share/mk/build/html.mk index 2a07c0fd30..b0eef461b1 100644 --- a/lib/build-html.mk +++ b/share/mk/build/html.mk @@ -8,9 +8,9 @@ ifndef MAKEFILE_BUILD_HTML_INCLUDED MAKEFILE_BUILD_HTML_INCLUDED := 1 -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/src.mk +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/src.mk htmlext := .html diff --git a/lib/build-src.mk b/share/mk/build/src.mk similarity index 96% rename from lib/build-src.mk rename to share/mk/build/src.mk index 15382c6be6..747cbd3985 100644 --- a/lib/build-src.mk +++ b/share/mk/build/src.mk @@ -8,10 +8,10 @@ ifndef MAKEFILE_BUILD_SRC_INCLUDED MAKEFILE_BUILD_SRC_INCLUDED := 1 -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/src.mk -include $(srcdir)/lib/verbose.mk +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/src.mk +include $(MAKEFILEDIR)/verbose.mk PKGCONF_LIBS := libbsd-overlay diff --git a/lib/check.mk b/share/mk/check/_.mk similarity index 100% rename from lib/check.mk rename to share/mk/check/_.mk diff --git a/lib/check-catman.mk b/share/mk/check/catman.mk similarity index 87% rename from lib/check-catman.mk rename to share/mk/check/catman.mk index 5e8718041d..400fba9b34 100644 --- a/lib/check-catman.mk +++ b/share/mk/check/catman.mk @@ -8,11 +8,11 @@ ifndef MAKEFILE_CHECK_CATMAN_INCLUDED MAKEFILE_CHECK_CATMAN_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/build-catman.mk -include $(srcdir)/lib/check.mk -include $(srcdir)/lib/src.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/build/catman.mk +include $(MAKEFILEDIR)/check/_.mk +include $(MAKEFILEDIR)/src.mk DEFAULT_COLFLAGS := -b diff --git a/lib/cmd.mk b/share/mk/cmd.mk similarity index 100% rename from lib/cmd.mk rename to share/mk/cmd.mk diff --git a/lib/compress.mk b/share/mk/compress.mk similarity index 100% rename from lib/compress.mk rename to share/mk/compress.mk diff --git a/lib/dist.mk b/share/mk/dist.mk similarity index 90% rename from lib/dist.mk rename to share/mk/dist.mk index b640024be9..b41518895a 100644 --- a/lib/dist.mk +++ b/share/mk/dist.mk @@ -8,17 +8,17 @@ ifndef MAKEFILE_DIST_INCLUDED MAKEFILE_DIST_INCLUDED := 1 -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/compress.mk -include $(srcdir)/lib/install.mk -include $(srcdir)/lib/version.mk -include $(srcdir)/lib/verbose.mk - +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/compress.mk +include $(MAKEFILEDIR)/install/_.mk +include $(MAKEFILEDIR)/version.mk +include $(MAKEFILEDIR)/verbose.mk _DISTDIR := $(builddir)/dist + DEFAULT_TARFLAGS := --sort=name DEFAULT_TARFLAGS += --owner=root:0 DEFAULT_TARFLAGS += --group=root:0 @@ -26,6 +26,7 @@ DEFAULT_TARFLAGS += --mtime='$(DISTDATE)' EXTRA_TARFLAGS := TARFLAGS := $(DEFAULT_TARFLAGS) $(EXTRA_TARFLAGS) + DISTFILES := $(shell $(GIT) ls-files $(HIDE_ERR) | $(SED) 's,^,$(srcdir)/,') _DISTFILES := $(patsubst $(srcdir)/%,$(_DISTDIR)/%,$(DISTFILES)) _DISTPAGES := $(filter $(_DISTDIR)/man%,$(_DISTFILES)) diff --git a/lib/install.mk b/share/mk/install/_.mk similarity index 95% rename from lib/install.mk rename to share/mk/install/_.mk index 23926d0e29..7064c2c9ff 100644 --- a/lib/install.mk +++ b/share/mk/install/_.mk @@ -8,7 +8,7 @@ ifndef MAKEFILE_INSTALL_INCLUDED MAKEFILE_INSTALL_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk +include $(MAKEFILEDIR)/cmd.mk DESTDIR := diff --git a/lib/install-html.mk b/share/mk/install/html.mk similarity index 93% rename from lib/install-html.mk rename to share/mk/install/html.mk index 9e0a44961c..c01c91fbae 100644 --- a/lib/install-html.mk +++ b/share/mk/install/html.mk @@ -8,8 +8,8 @@ ifndef MAKEFILE_INSTALL_HTML_INCLUDED MAKEFILE_INSTALL_HTML_INCLUDED := 1 -include $(srcdir)/lib/build-html.mk -include $(srcdir)/lib/install.mk +include $(MAKEFILEDIR)/build/html.mk +include $(MAKEFILEDIR)/install/_.mk htmldir := $(docdir) diff --git a/lib/install-man.mk b/share/mk/install/man.mk similarity index 98% rename from lib/install-man.mk rename to share/mk/install/man.mk index 9979571a43..373c22c01f 100644 --- a/lib/install-man.mk +++ b/share/mk/install/man.mk @@ -8,10 +8,10 @@ ifndef MAKEFILE_INSTALL_MAN_INCLUDED MAKEFILE_INSTALL_MAN_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/compress.mk -include $(srcdir)/lib/install.mk -include $(srcdir)/lib/src.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/compress.mk +include $(MAKEFILEDIR)/install/_.mk +include $(MAKEFILEDIR)/src.mk LINK_PAGES := .so diff --git a/lib/lint.mk b/share/mk/lint/_.mk similarity index 100% rename from lib/lint.mk rename to share/mk/lint/_.mk diff --git a/lib/lint-c.mk b/share/mk/lint/c.mk similarity index 96% rename from lib/lint-c.mk rename to share/mk/lint/c.mk index 8d0b98822e..7bdd31e8e7 100644 --- a/lib/lint-c.mk +++ b/share/mk/lint/c.mk @@ -8,9 +8,9 @@ ifndef MAKEFILE_LINT_C_INCLUDED MAKEFILE_LINT_C_INCLUDED := 1 -include $(srcdir)/lib/build-src.mk -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/lint.mk +include $(MAKEFILEDIR)/build/src.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/lint/_.mk DEFAULT_CHECKPATCHFLAGS := diff --git a/lib/lint-man.mk b/share/mk/lint/man.mk similarity index 94% rename from lib/lint-man.mk rename to share/mk/lint/man.mk index b896eb0e98..9d9d6cea8f 100644 --- a/lib/lint-man.mk +++ b/share/mk/lint/man.mk @@ -8,10 +8,10 @@ ifndef MAKEFILE_LINT_MAN_INCLUDED MAKEFILE_LINT_MAN_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/build.mk -include $(srcdir)/lib/lint.mk -include $(srcdir)/lib/src.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/build/_.mk +include $(MAKEFILEDIR)/lint/_.mk +include $(MAKEFILEDIR)/src.mk DEFAULT_MANDOCFLAGS := -man diff --git a/lib/src.mk b/share/mk/src.mk similarity index 97% rename from lib/src.mk rename to share/mk/src.mk index 46736532f9..41a6332117 100644 --- a/lib/src.mk +++ b/share/mk/src.mk @@ -8,7 +8,7 @@ ifndef MAKEFILE_SRC_INCLUDED MAKEFILE_SRC_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk +include $(MAKEFILEDIR)/cmd.mk MANDIR := $(srcdir) diff --git a/lib/verbose.mk b/share/mk/verbose.mk similarity index 100% rename from lib/verbose.mk rename to share/mk/verbose.mk diff --git a/lib/version.mk b/share/mk/version.mk similarity index 89% rename from lib/version.mk rename to share/mk/version.mk index 1d17b6c998..31153c7798 100644 --- a/lib/version.mk +++ b/share/mk/version.mk @@ -8,8 +8,8 @@ ifndef MAKEFILE_VERSION_INCLUDED MAKEFILE_VERSION_INCLUDED := 1 -include $(srcdir)/lib/cmd.mk -include $(srcdir)/lib/verbose.mk +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/verbose.mk DISTNAME := $(shell $(GIT) describe $(HIDE_ERR))