summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2024-02-10 00:17:02 +0100
committerAlejandro Colomar <alx@kernel.org>2024-02-10 00:17:02 +0100
commitb760d65e0f92f74068fdf3a9318a84575ff597fe (patch)
tree19b8d07193b3b93df68e5b777406e1bfc9065ed2
parent9d33ae7ce9eac637599abfbce882aebfb9981b7c (diff)
downloadliba2i-b760d65e0f92f74068fdf3a9318a84575ff597fe.tar.gz
share/mk/: Organize files in share/mk/configure/
Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--share/mk/build/deps.mk6
-rw-r--r--share/mk/build/dev-pc.mk2
-rw-r--r--share/mk/build/lib-shared.mk4
-rw-r--r--share/mk/build/lib-static.mk2
-rw-r--r--share/mk/build/obj.mk6
-rw-r--r--share/mk/check.mk4
-rw-r--r--share/mk/configure/ar.mk (renamed from share/mk/configure-ar.mk)0
-rw-r--r--share/mk/configure/as.mk (renamed from share/mk/configure-as.mk)4
-rw-r--r--share/mk/configure/cc.mk (renamed from share/mk/configure-cc.mk)0
-rw-r--r--share/mk/configure/cpp.mk (renamed from share/mk/configure-cpp.mk)4
-rw-r--r--share/mk/configure/ld.mk (renamed from share/mk/configure-ld.mk)4
-rw-r--r--share/mk/configure/pkgconf.mk (renamed from share/mk/configure-pkgconf.mk)0
-rw-r--r--share/mk/lint-c.mk4
13 files changed, 20 insertions, 20 deletions
diff --git a/share/mk/build/deps.mk b/share/mk/build/deps.mk
index d3e763b..2f33c58 100644
--- a/share/mk/build/deps.mk
+++ b/share/mk/build/deps.mk
@@ -7,9 +7,9 @@ MAKEFILE_BUILD_DEPS_INCLUDED := 1
include $(MAKEFILEDIR)/build/_.mk
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-cpp.mk
-include $(MAKEFILEDIR)/configure-pkgconf.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/cpp.mk
+include $(MAKEFILEDIR)/configure/pkgconf.mk
include $(MAKEFILEDIR)/cmd.mk
include $(MAKEFILEDIR)/src.mk
include $(MAKEFILEDIR)/version.mk
diff --git a/share/mk/build/dev-pc.mk b/share/mk/build/dev-pc.mk
index beb6c32..afe9613 100644
--- a/share/mk/build/dev-pc.mk
+++ b/share/mk/build/dev-pc.mk
@@ -6,7 +6,7 @@ ifndef MAKEFILE_BUILD_DEV_PC_INCLUDED
MAKEFILE_BUILD_DEV_PC_INCLUDED := 1
-include $(MAKEFILEDIR)/configure-pkgconf.mk
+include $(MAKEFILEDIR)/configure/pkgconf.mk
include $(MAKEFILEDIR)/cmd.mk
include $(MAKEFILEDIR)/install.mk
include $(MAKEFILEDIR)/src.mk
diff --git a/share/mk/build/lib-shared.mk b/share/mk/build/lib-shared.mk
index fb84135..1540e7c 100644
--- a/share/mk/build/lib-shared.mk
+++ b/share/mk/build/lib-shared.mk
@@ -7,8 +7,8 @@ MAKEFILE_BUILD_LIB_SHARED_INCLUDED := 1
include $(MAKEFILEDIR)/build/obj.mk
-include $(MAKEFILEDIR)/configure-ld.mk
-include $(MAKEFILEDIR)/configure-pkgconf.mk
+include $(MAKEFILEDIR)/configure/ld.mk
+include $(MAKEFILEDIR)/configure/pkgconf.mk
include $(MAKEFILEDIR)/src.mk
include $(MAKEFILEDIR)/verbose.mk
include $(MAKEFILEDIR)/version.mk
diff --git a/share/mk/build/lib-static.mk b/share/mk/build/lib-static.mk
index 82143df..21ee917 100644
--- a/share/mk/build/lib-static.mk
+++ b/share/mk/build/lib-static.mk
@@ -9,7 +9,7 @@ MAKEFILE_BUILD_LIB_STATIC_INCLUDED := 1
include $(MAKEFILEDIR)/build/_.mk
include $(MAKEFILEDIR)/build/obj.mk
include $(MAKEFILEDIR)/cmd.mk
-include $(MAKEFILEDIR)/configure-ar.mk
+include $(MAKEFILEDIR)/configure/ar.mk
include $(MAKEFILEDIR)/version.mk
diff --git a/share/mk/build/obj.mk b/share/mk/build/obj.mk
index d9aa9fd..19cb861 100644
--- a/share/mk/build/obj.mk
+++ b/share/mk/build/obj.mk
@@ -8,9 +8,9 @@ MAKEFILE_BUILD_OBJ_INCLUDED := 1
include $(MAKEFILEDIR)/build/deps.mk
include $(MAKEFILEDIR)/cmd.mk
-include $(MAKEFILEDIR)/configure-as.mk
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-cpp.mk
+include $(MAKEFILEDIR)/configure/as.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/cpp.mk
include $(MAKEFILEDIR)/src.mk
include $(MAKEFILEDIR)/verbose.mk
include $(MAKEFILEDIR)/version.mk
diff --git a/share/mk/check.mk b/share/mk/check.mk
index b65bcc9..5ace5bf 100644
--- a/share/mk/check.mk
+++ b/share/mk/check.mk
@@ -8,8 +8,8 @@ MAKEFILE_CHECK_INCLUDED := 1
include $(MAKEFILEDIR)/build/lib-shared.mk
include $(MAKEFILEDIR)/build/lib-static.mk
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-pkgconf.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/pkgconf.mk
include $(MAKEFILEDIR)/install-dev-include.mk
include $(MAKEFILEDIR)/install-lib-shared.mk
include $(MAKEFILEDIR)/install-lib-static.mk
diff --git a/share/mk/configure-ar.mk b/share/mk/configure/ar.mk
index 452a606..452a606 100644
--- a/share/mk/configure-ar.mk
+++ b/share/mk/configure/ar.mk
diff --git a/share/mk/configure-as.mk b/share/mk/configure/as.mk
index 4c91a3f..2b8a2b9 100644
--- a/share/mk/configure-as.mk
+++ b/share/mk/configure/as.mk
@@ -6,8 +6,8 @@ ifndef MAKEFILE_CONFIGURE_AS_INCLUDED
MAKEFILE_CONFIGURE_AS_INCLUDED := 1
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-cpp.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/cpp.mk
DEFAULT_ASFLAGS :=
diff --git a/share/mk/configure-cc.mk b/share/mk/configure/cc.mk
index a9afce7..a9afce7 100644
--- a/share/mk/configure-cc.mk
+++ b/share/mk/configure/cc.mk
diff --git a/share/mk/configure-cpp.mk b/share/mk/configure/cpp.mk
index 5c76000..d9f2f45 100644
--- a/share/mk/configure-cpp.mk
+++ b/share/mk/configure/cpp.mk
@@ -6,8 +6,8 @@ ifndef MAKEFILE_CONFIGURE_CPP_INCLUDED
MAKEFILE_CONFIGURE_CPP_INCLUDED := 1
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-pkgconf.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/pkgconf.mk
DEFAULT_CPPFLAGS := $(shell $(PKGCONF_CMD) --cflags $(pc))
diff --git a/share/mk/configure-ld.mk b/share/mk/configure/ld.mk
index 11b4853..c9ffae1 100644
--- a/share/mk/configure-ld.mk
+++ b/share/mk/configure/ld.mk
@@ -7,8 +7,8 @@ MAKEFILE_CONFIGURE_LD_INCLUDED := 1
include $(MAKEFILEDIR)/cmd.mk
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-pkgconf.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/pkgconf.mk
include $(MAKEFILEDIR)/verbose.mk
include $(MAKEFILEDIR)/version.mk
diff --git a/share/mk/configure-pkgconf.mk b/share/mk/configure/pkgconf.mk
index 1389bdf..1389bdf 100644
--- a/share/mk/configure-pkgconf.mk
+++ b/share/mk/configure/pkgconf.mk
diff --git a/share/mk/lint-c.mk b/share/mk/lint-c.mk
index 33a0280..ac888eb 100644
--- a/share/mk/lint-c.mk
+++ b/share/mk/lint-c.mk
@@ -7,8 +7,8 @@ MAKEFILE_LINT_C_INCLUDED := 1
include $(MAKEFILEDIR)/build/deps.mk
-include $(MAKEFILEDIR)/configure-cc.mk
-include $(MAKEFILEDIR)/configure-cpp.mk
+include $(MAKEFILEDIR)/configure/cc.mk
+include $(MAKEFILEDIR)/configure/cpp.mk
include $(MAKEFILEDIR)/src.mk
include $(MAKEFILEDIR)/version.mk