diff options
| author | Alejandro Colomar <alx@kernel.org> | 2024-02-10 01:44:42 +0100 |
|---|---|---|
| committer | Alejandro Colomar <alx@kernel.org> | 2024-02-10 01:44:42 +0100 |
| commit | 015966a02cf9480e20ef8071aab6a6c7e7b40bac (patch) | |
| tree | 7f7047fedee0496398867c0f9b280b5144d150d4 | |
| parent | 3e15a9205fb2378d49e6ed367a7f7009d40fb464 (diff) | |
| download | liba2i-015966a02cf9480e20ef8071aab6a6c7e7b40bac.tar.gz | |
share/mk/dist/: dist-tar: Split to separate file
Signed-off-by: Alejandro Colomar <alx@kernel.org>
| -rw-r--r-- | share/mk/dist/_.mk | 19 | ||||
| -rw-r--r-- | share/mk/dist/tar.mk | 32 |
2 files changed, 33 insertions, 18 deletions
diff --git a/share/mk/dist/_.mk b/share/mk/dist/_.mk index 502b58b..5a5c11c 100644 --- a/share/mk/dist/_.mk +++ b/share/mk/dist/_.mk @@ -6,19 +6,14 @@ ifndef MAKEFILE_DIST_INCLUDED MAKEFILE_DIST_INCLUDED := 1 -include $(MAKEFILEDIR)/build/_.mk include $(MAKEFILEDIR)/cmd.mk include $(MAKEFILEDIR)/compress.mk -include $(MAKEFILEDIR)/configure/tar.mk include $(MAKEFILEDIR)/install/_.mk -include $(MAKEFILEDIR)/version.mk -include $(MAKEFILEDIR)/verbose.mk _DISTDIR := $(builddir)/dist -DISTFILE := $(builddir)/$(DISTNAME).tar compression := bz2 gz lz xz @@ -32,14 +27,6 @@ $(builddir)/dist/%/: | $(builddir)/dist/ +$(INSTALL_DIR) $@ -$(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/ - $(info TAR $@) - $(TAR) $(TARFLAGS) -cf $@ -T /dev/null - $(GIT) ls-files \ - | $(SED) 's,^,$(_DISTDIR)/,' \ - | $(XARGS) $(TAR) $(TARFLAGS) -rf $@ -C $(srcdir) \ - --transform 's,^$(_DISTDIR),$(DISTNAME),' - define DISTFILE_z_rule $(DISTFILE).$(2): %.$(2): % $(MK) | $$$$(@D)/ $$(info $(1) $$@) @@ -53,16 +40,12 @@ $(eval $(call DISTFILE_z_rule,LZIP,lz)) $(eval $(call DISTFILE_z_rule,XZ,xz)) -.PHONY: dist-tar -dist-tar: $(DISTFILE); - - $(foreach z, $(compression), \ $(eval .PHONY: dist-$(z))) $(foreach z, $(compression), \ $(eval dist-$(z): $(DISTFILE).$(z);)) .PHONY: dist -dist: $(foreach z, $(compression), dist-$(z)); +dist: dist-tar $(foreach z, $(compression), dist-$(z)); endif # include guard diff --git a/share/mk/dist/tar.mk b/share/mk/dist/tar.mk new file mode 100644 index 0000000..f65feb4 --- /dev/null +++ b/share/mk/dist/tar.mk @@ -0,0 +1,32 @@ +# Copyright 2021-2024 Alejandro Colomar <alx@kernel.org> +# SPDX-License-Identifier: LGPL-3.0-only WITH LGPL-3.0-linking-exception + + +ifndef MAKEFILE_DIST_TAR_INCLUDED +MAKEFILE_DIST_TAR_INCLUDED := 1 + + +include $(MAKEFILEDIR)/cmd.mk +include $(MAKEFILEDIR)/configure/tar.mk +include $(MAKEFILEDIR)/dist/_.mk +include $(MAKEFILEDIR)/dist/files.mk +include $(MAKEFILEDIR)/version.mk + + +DISTFILE := $(builddir)/$(DISTNAME).tar + + +$(DISTFILE): $(_DISTFILES) $(MK) | $$(@D)/ + $(info TAR $@) + $(TAR) $(TARFLAGS) -cf $@ -T /dev/null + $(GIT) ls-files \ + | $(SED) 's,^,$(_DISTDIR)/,' \ + | $(XARGS) $(TAR) $(TARFLAGS) -rf $@ -C $(srcdir) \ + --transform 's,^$(_DISTDIR),$(DISTNAME),' + + +.PHONY: dist-tar +dist-tar: $(DISTFILE); + + +endif # include guard |