diff options
author | Alejandro Colomar <alx@kernel.org> | 2023-04-14 15:53:53 +0200 |
---|---|---|
committer | Alejandro Colomar <alx@kernel.org> | 2023-04-14 15:54:08 +0200 |
commit | edaa12e6bb7d8c64357a9992fcaa2c815f00fefa (patch) | |
tree | 7edac4259e63bb3063532f159b427e502edaf2d2 | |
parent | 6e502b913302d5ba4b70a2f3e6b3ff38748d2d0f (diff) |
*.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 <alx@kernel.org>
-rw-r--r-- | Makefile | 32 | ||||
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | RELEASE | 4 | ||||
-rw-r--r-- | share/mk/build/_.mk (renamed from lib/build.mk) | 4 | ||||
-rw-r--r-- | share/mk/build/catman.mk (renamed from lib/build-catman.mk) | 6 | ||||
-rw-r--r-- | share/mk/build/html.mk (renamed from lib/build-html.mk) | 6 | ||||
-rw-r--r-- | share/mk/build/src.mk (renamed from lib/build-src.mk) | 8 | ||||
-rw-r--r-- | share/mk/check/_.mk (renamed from lib/check.mk) | 0 | ||||
-rw-r--r-- | share/mk/check/catman.mk (renamed from lib/check-catman.mk) | 10 | ||||
-rw-r--r-- | share/mk/cmd.mk (renamed from lib/cmd.mk) | 0 | ||||
-rw-r--r-- | share/mk/compress.mk (renamed from lib/compress.mk) | 0 | ||||
-rw-r--r-- | share/mk/dist.mk (renamed from lib/dist.mk) | 15 | ||||
-rw-r--r-- | share/mk/install/_.mk (renamed from lib/install.mk) | 2 | ||||
-rw-r--r-- | share/mk/install/html.mk (renamed from lib/install-html.mk) | 4 | ||||
-rw-r--r-- | share/mk/install/man.mk (renamed from lib/install-man.mk) | 8 | ||||
-rw-r--r-- | share/mk/lint/_.mk (renamed from lib/lint.mk) | 0 | ||||
-rw-r--r-- | share/mk/lint/c.mk (renamed from lib/lint-c.mk) | 6 | ||||
-rw-r--r-- | share/mk/lint/man.mk (renamed from lib/lint-man.mk) | 8 | ||||
-rw-r--r-- | share/mk/src.mk (renamed from lib/src.mk) | 2 | ||||
-rw-r--r-- | share/mk/verbose.mk (renamed from lib/verbose.mk) | 0 | ||||
-rw-r--r-- | share/mk/version.mk (renamed from lib/version.mk) | 4 |
21 files changed, 62 insertions, 59 deletions
@@ -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 @@ -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 <INSTALL> file, and run 'make help'. lsm @@ -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 <lib/dist.mk>, and any makefiles + the variables available at <share/mk/dist.mk>, 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 index 2025ebde4..0bd4c949c 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 index f689e0b64..8c95931e5 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 index 2a07c0fd3..b0eef461b 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 index 15382c6be..747cbd398 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 index 90190619e..90190619e 100644 --- a/lib/check.mk +++ b/share/mk/check/_.mk diff --git a/lib/check-catman.mk b/share/mk/check/catman.mk index 5e8718041..400fba9b3 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 index 92b469fc3..92b469fc3 100644 --- a/lib/cmd.mk +++ b/share/mk/cmd.mk diff --git a/lib/compress.mk b/share/mk/compress.mk index 737b44787..737b44787 100644 --- a/lib/compress.mk +++ b/share/mk/compress.mk diff --git a/lib/dist.mk b/share/mk/dist.mk index b640024be..b41518895 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 index 23926d0e2..7064c2c9f 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 index 9e0a44961..c01c91fba 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 index 9979571a4..373c22c01 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 index c81f283da..c81f283da 100644 --- a/lib/lint.mk +++ b/share/mk/lint/_.mk diff --git a/lib/lint-c.mk b/share/mk/lint/c.mk index 8d0b98822..7bdd31e8e 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 index b896eb0e9..9d9d6cea8 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 index 46736532f..41a633211 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 index af2fe154f..af2fe154f 100644 --- a/lib/verbose.mk +++ b/share/mk/verbose.mk diff --git a/lib/version.mk b/share/mk/version.mk index 1d17b6c99..31153c779 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)) |