*.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>

diff --git a/Makefile b/Makefile
index 62b59dcd54bde49221c1a530fa17f639f110c583..d55191b4d57d2a7d40075815c730f20d779b5798 100644 (file)
--- 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 82794e3480c7e83ecc82c6720c4a2be2ae643db6..87248c8dcba2abc938d72a04c90d437eeb5e4fae 100644 (file)
--- 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 <INSTALL> file, and run 'make help'.
 
    lsm

diff --git a/RELEASE b/RELEASE
index 1738da08bbf2737c58027a5155a1cc98b1d74954..1e20718bb98aea66e826ab20d19b366b27e424f4 100644 (file)
--- 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 <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
similarity index 93%
rename from lib/build.mk
rename to share/mk/build/_.mk
index 2025ebde42b935de2e82b818a7a6e051f6b6672d..0bd4c949c5de7d76fd374e81c624980190a917c4 100644 (file)
--- 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 f689e0b64985f7cc37d88882b8ba5623d9b61be5..8c95931e50cc7d254ed3fffd0bf42f08db616c5c 100644 (file)
--- 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 2a07c0fd308cdf28dae8f9eca6ef1be5ebca43ff..b0eef461b14420ae632af66290b4618133af471d 100644 (file)
--- 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 15382c6be64d47d9c7ef4c8e18948bb1a49cbaa7..747cbd39850d9b7ff0ed07b6447b6c376ff46be9 100644 (file)
--- 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 5e8718041d0b41f6badfc2975cc10bbdc8f5a0ab..400fba9b341cb81cfe3ec905872e01943bda6e01 100644 (file)
--- 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 b640024be9c7ea29a34988680446d17c5d58edef..b41518895a5b5db7f02c915da64bc0cae3b2dac1 100644 (file)
--- 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 23926d0e296101cf154a66007e010435a6d6e7e4..7064c2c9ffcf3d9d4541708b10a617a57623a978 100644 (file)
--- 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 9e0a44961c7a15b5a2d98df39ef489f1fb61d248..c01c91fbae7af9ea5a496bb9b8a033967e89aa2a 100644 (file)
--- 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 9979571a430128076046806491863c6cdf971100..373c22c01fb4818ee7989c1552adeff172ea7289 100644 (file)
--- 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 8d0b98822ec9a7142049839edb14752bfc97e8e7..7bdd31e8e70d9d3e39780d2cb9b1372af0294ace 100644 (file)
--- 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 b896eb0e980d041512a367fe0b71dc3621e21c84..9d9d6cea8fc3a4227d302e1ff141b3f6eccfcfb4 100644 (file)
--- 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 46736532f95cfb4d3ccc32951318e5ec3298f491..41a633211788749b9c34c1c1d41f59a0a54bd3b2 100644 (file)
--- 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 1d17b6c9982fe283655ac13aecdcc54a1caa8676..31153c779831cc1ec0115974fe616ab7be53849d 100644 (file)
--- 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))