summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Colomar <alx@kernel.org>2024-02-12 13:24:46 +0100
committerAlejandro Colomar <alx@kernel.org>2024-02-12 13:24:46 +0100
commitd7f82dbbb723d8d54219042593b21fdd66b56a39 (patch)
treed8555695b16a9d34f777f180de404ed1529fa421
parent2b2bce1a8adcef2a2b2680e17719e415d37ceee4 (diff)
downloadliba2i-d7f82dbbb723d8d54219042593b21fdd66b56a39.tar.gz
share/mk/: Use one configure/ makefile per dependency package
This makes it easy to see the dependencies. Signed-off-by: Alejandro Colomar <alx@kernel.org>
-rw-r--r--share/mk/configure/bzip2.mk15
-rw-r--r--share/mk/configure/gzip.mk15
-rw-r--r--share/mk/configure/lzip.mk15
-rw-r--r--share/mk/configure/xz-utils.mk15
-rw-r--r--share/mk/configure/z.mk30
-rw-r--r--share/mk/dist/z.mk5
6 files changed, 64 insertions, 31 deletions
diff --git a/share/mk/configure/bzip2.mk b/share/mk/configure/bzip2.mk
new file mode 100644
index 0000000..288f2d7
--- /dev/null
+++ b/share/mk/configure/bzip2.mk
@@ -0,0 +1,15 @@
+# Copyright 2023-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_BZIP2_INCLUDED
+MAKEFILE_CONFIGURE_BZIP2_INCLUDED := 1
+
+
+DEFAULT_BZIP2FLAGS :=
+EXTRA_BZIP2FLAGS :=
+BZIP2FLAGS := $(DEFAULT_BZIP2FLAGS) $(EXTRA_BZIP2FLAGS)
+BZIP2 := bzip2
+
+
+endif # include guard
diff --git a/share/mk/configure/gzip.mk b/share/mk/configure/gzip.mk
new file mode 100644
index 0000000..d48e557
--- /dev/null
+++ b/share/mk/configure/gzip.mk
@@ -0,0 +1,15 @@
+# Copyright 2023-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_GZIP_INCLUDED
+MAKEFILE_CONFIGURE_GZIP_INCLUDED := 1
+
+
+DEFAULT_GZIPFLAGS := -n
+EXTRA_GZIPFLAGS :=
+GZIPFLAGS := $(DEFAULT_GZIPFLAGS) $(EXTRA_GZIPFLAGS)
+GZIP := gzip
+
+
+endif # include guard
diff --git a/share/mk/configure/lzip.mk b/share/mk/configure/lzip.mk
new file mode 100644
index 0000000..edaf784
--- /dev/null
+++ b/share/mk/configure/lzip.mk
@@ -0,0 +1,15 @@
+# Copyright 2023-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_LZIP_INCLUDED
+MAKEFILE_CONFIGURE_LZIP_INCLUDED := 1
+
+
+DEFAULT_LZIPFLAGS :=
+EXTRA_LZIPFLAGS :=
+LZIPFLAGS := $(DEFAULT_LZIPFLAGS) $(EXTRA_LZIPFLAGS)
+LZIP := lzip
+
+
+endif # include guard
diff --git a/share/mk/configure/xz-utils.mk b/share/mk/configure/xz-utils.mk
new file mode 100644
index 0000000..46cc9e2
--- /dev/null
+++ b/share/mk/configure/xz-utils.mk
@@ -0,0 +1,15 @@
+# Copyright 2023-2024 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
+
+
+ifndef MAKEFILE_CONFIGURE_XZ_UTILS_INCLUDED
+MAKEFILE_CONFIGURE_XZ_UTILS_INCLUDED := 1
+
+
+DEFAULT_XZFLAGS :=
+EXTRA_XZFLAGS :=
+XZFLAGS := $(DEFAULT_XZFLAGS) $(EXTRA_XZFLAGS)
+XZ := xz
+
+
+endif # include guard
diff --git a/share/mk/configure/z.mk b/share/mk/configure/z.mk
deleted file mode 100644
index e6f343a..0000000
--- a/share/mk/configure/z.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 2023-2024 Alejandro Colomar <alx@kernel.org>
-# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception
-
-
-ifndef MAKEFILE_CONFIGURE_Z_INCLUDED
-MAKEFILE_CONFIGURE_Z_INCLUDED := 1
-
-
-DEFAULT_BZIP2FLAGS :=
-EXTRA_BZIP2FLAGS :=
-BZIP2FLAGS := $(DEFAULT_BZIP2FLAGS) $(EXTRA_BZIP2FLAGS)
-BZIP2 := bzip2
-
-DEFAULT_GZIPFLAGS := -n
-EXTRA_GZIPFLAGS :=
-GZIPFLAGS := $(DEFAULT_GZIPFLAGS) $(EXTRA_GZIPFLAGS)
-GZIP := gzip
-
-DEFAULT_LZIPFLAGS :=
-EXTRA_LZIPFLAGS :=
-LZIPFLAGS := $(DEFAULT_LZIPFLAGS) $(EXTRA_LZIPFLAGS)
-LZIP := lzip
-
-DEFAULT_XZFLAGS :=
-EXTRA_XZFLAGS :=
-XZFLAGS := $(DEFAULT_XZFLAGS) $(EXTRA_XZFLAGS)
-XZ := xz
-
-
-endif # include guard
diff --git a/share/mk/dist/z.mk b/share/mk/dist/z.mk
index c1fcea3..ebb49ce 100644
--- a/share/mk/dist/z.mk
+++ b/share/mk/dist/z.mk
@@ -6,8 +6,11 @@ ifndef MAKEFILE_DIST_Z_INCLUDED
MAKEFILE_DIST_Z_INCLUDED := 1
+include $(MAKEFILEDIR)/configure/bzip2.mk
include $(MAKEFILEDIR)/configure/coreutils.mk
-include $(MAKEFILEDIR)/configure/z.mk
+include $(MAKEFILEDIR)/configure/gzip.mk
+include $(MAKEFILEDIR)/configure/lzip.mk
+include $(MAKEFILEDIR)/configure/xz-utils.mk
include $(MAKEFILEDIR)/dist/tar.mk