*.mk: Add *FLAGS variables for compression commands

Also, document the LZIP variable.

Fixes: 69ad95988f40 ("*.mk: dist, dist-lz: Create tarballs compressed with lzip(1)")
Signed-off-by: Alejandro Colomar <alx@kernel.org>

4 files changed, 52 insertions, 20 deletions

diff --git a/Makefile b/Makefile
index 09a1deef6..6f5f2deb2 100644
--- a/Makefile
+++ b/Makefile
@@ -177,16 +177,17 @@ help-variables:
 	$(info	MANDOC		{EXTRA_,}MANDOCFLAGS)
 	$(info	MAN2HTML	{EXTRA_,}MAN2HTMLFLAGS)
 	$(info	)
-	$(info	BZIP2)
+	$(info	BZIP2		{EXTRA_,}BZIP2FLAGS)
 	$(info	CP)
 	$(info	ECHO)
 	$(info	EXPR)
 	$(info	FIND)
 	$(info	GIT)
-	$(info	GZIP)
+	$(info	GZIP		{EXTRA_,}GZIPFLAGS)
 	$(info	HEAD)
 	$(info	LN)
 	$(info	LOCALE)
+	$(info	LZIP		{EXTRA_,}LZIPFLAGS)
 	$(info	PKGCONF)
 	$(info	SED)
 	$(info	SORT)
@@ -196,7 +197,7 @@ help-variables:
 	$(info	TAR)
 	$(info	TEST)
 	$(info	XARGS)
-	$(info	XZ)
+	$(info	XZ		{EXTRA_,}XZFLAGS)
 	$(info	)
 	$(info	INSTALL)
 	$(info	INSTALL_DATA)
diff --git a/lib/compress.mk b/lib/compress.mk
new file mode 100644
index 000000000..0edcc99e7
--- /dev/null
+++ b/lib/compress.mk
@@ -0,0 +1,39 @@
+########################################################################
+# Copyright (C) 2023 Alejandro Colomar <alx@kernel.org>
+# SPDX-License-Identifier: GPL-2.0 OR LGPL-2.0
+########################################################################
+
+
+ifndef MAKEFILE_COMPRESS_INCLUDED
+MAKEFILE_COMPRESS_INCLUDED := 1
+
+
+Z :=
+ifeq ($(Z),)
+else ifeq ($(Z),.bz2)
+else ifeq ($(Z),.gz)
+else ifeq ($(Z),.lz)
+else
+$(warning "Z": "$(Z)")
+$(error Valid values for "Z": ["", ".bz2", ".gz", ".lz"])
+endif
+
+
+DEFAULT_BZIP2FLAGS :=
+EXTRA_BZIP2FLAGS   :=
+BZIP2FLAGS         := $(DEFAULT_BZIP2FLAGS) $(EXTRA_BZIP2FLAGS)
+
+DEFAULT_GZIPFLAGS  :=
+EXTRA_GZIPFLAGS    :=
+GZIPFLAGS          := $(DEFAULT_GZIPFLAGS) $(EXTRA_GZIPFLAGS)
+
+DEFAULT_LZIPFLAGS  :=
+EXTRA_LZIPFLAGS    :=
+LZIPFLAGS          := $(DEFAULT_LZIPFLAGS) $(EXTRA_LZIPFLAGS)
+
+DEFAULT_XZFLAGS    :=
+EXTRA_XZFLAGS      :=
+XZFLAGS            := $(DEFAULT_XZFLAGS) $(EXTRA_XZFLAGS)
+
+
+endif  # MAKEFILE_COMPRESS_INCLUDED
diff --git a/lib/dist.mk b/lib/dist.mk
index d3c04d147..b640024be 100644
--- a/lib/dist.mk
+++ b/lib/dist.mk
@@ -10,6 +10,7 @@ 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
@@ -56,21 +57,21 @@ $(DISTFILE): $(_DISTFILES) | $$(@D)/
 
 $(DISTFILE).bz2: %.bz2: % | $$(@D)/
 	$(info BZIP2	$@)
-	$(BZIP2) -kf $<
+	$(BZIP2) $(BZIP2FLAGS) -kf $<
 	touch $@
 
 $(DISTFILE).gz: %.gz: % | $$(@D)/
 	$(info GZIP	$@)
-	$(GZIP) -knf $<
+	$(GZIP) $(GZIPFLAGS) -knf $<
 
 $(DISTFILE).lz: %.lz: % | $$(@D)/
 	$(info LZIP	$@)
-	$(LZIP) -kf $<
+	$(LZIP) $(LZIPFLAGS) -kf $<
 	touch $@
 
 $(DISTFILE).xz: %.xz: % | $$(@D)/
 	$(info XZ	$@)
-	$(XZ) -kf $<
+	$(XZ) $(XZFLAGS) -kf $<
 
 
 .PHONY: dist-tar
diff --git a/lib/install-man.mk b/lib/install-man.mk
index 4e56bdb41..1cbb984e6 100644
--- a/lib/install-man.mk
+++ b/lib/install-man.mk
@@ -9,6 +9,7 @@ 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
 
@@ -21,16 +22,6 @@ $(warning "LINK_PAGES": "$(LINK_PAGES)")
 $(error Valid values for "LINK_PAGES": [".so", "symlink"])
 endif
 
-Z :=
-ifeq ($(Z),)
-else ifeq ($(Z),.bz2)
-else ifeq ($(Z),.gz)
-else ifeq ($(Z),.lz)
-else
-$(warning "Z": "$(Z)")
-$(error Valid values for "Z": ["", ".bz2", ".gz", ".lz"])
-endif
-
 
 mandir      := $(datarootdir)/man
 man1dir     := $(mandir)/man1
@@ -176,17 +167,17 @@ ifeq ($(LINK_PAGES),symlink)
 endif
 ifeq ($(Z),.bz2)
 	if ! $(TEST) -L $@; then \
-		$(BZIP2) <$@ \
+		$(BZIP2) $(BZIP2FLAGS) <$@ \
 		| $(SPONGE) $@; \
 	fi
 else ifeq ($(Z),.gz)
 	if ! $(TEST) -L $@; then \
-		$(GZIP) - <$@ \
+		$(GZIP) $(GZIPFLAGS) - <$@ \
 		| $(SPONGE) $@; \
 	fi
 else ifeq ($(Z),.lz)
 	if ! $(TEST) -L $@; then \
-		$(LZIP) - <$@ \
+		$(LZIP) $(LZIPFLAGS) - <$@ \
 		| $(SPONGE) $@; \
 	fi
 endif