From b350a8f3f073643e674f670b711cc99a778f60d6 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Sun, 14 Dec 2025 11:58:34 +0100 Subject: [PATCH] Rename svg.mk to svg-to-pixmap.mk To avoid name collisions, rename svg.mk to the more specialized svg-to-pixmap.mk, because that's what it does. To the same end, rename $(SVG) to $(PIXMAP_TO_SVG_SRC_SVG). Signed-off-by: Jan Lindemann --- make/{svg.mk => svg-to-pixmap.mk} | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) rename make/{svg.mk => svg-to-pixmap.mk} (76%) diff --git a/make/svg.mk b/make/svg-to-pixmap.mk similarity index 76% rename from make/svg.mk rename to make/svg-to-pixmap.mk index 16aa8124..a0adf4a3 100644 --- a/make/svg.mk +++ b/make/svg-to-pixmap.mk @@ -1,6 +1,6 @@ SVG_GENERATE_FORMATS ?= png svg -SVG ?= $(filter-out copied-%,$(wildcard *.svg)) -COPIED_SVG = $(addprefix copied-,$(notdir $(SVG))) +PIXMAP_TO_SVG_SRC_SVG ?= $(filter-out copied-%,$(wildcard *.svg)) +COPIED_SVG = $(addprefix copied-,$(notdir $(PIXMAP_TO_SVG_SRC_SVG))) INKSCAPE_VERSION = $(shell export -n DISPLAY; inkscape -V 2>&1 | sed '/Inkscape/ !d; s/Inkscape *\([0-9.]\+\) .*/\1/') INKSCAPE_VERSION_MAJOR = $(word 1,$(subst ., ,$(INKSCAPE_VERSION))) ifeq ($(INKSCAPE_VERSION_MAJOR),1) @@ -15,24 +15,24 @@ GENERATED_WIDTHS ?= $(GENERATED_ICON_WIDTHS) $(GENERATED_EXTRA_WIDTHS ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),) GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS) GENERATED_PNG ?= \ - $(foreach w, $(GENERATED_WIDTHS_PNG),$(patsubst %.svg,%-$w.png,$(notdir $(SVG)))) + $(foreach w, $(GENERATED_WIDTHS_PNG),$(patsubst %.svg,%-$w.png,$(notdir $(PIXMAP_TO_SVG_SRC_SVG)))) GENERATED_IMAGES += $(GENERATED_PNG) endif ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),) GENERATED_WIDTHS_ICO ?= 16 32 GENERATED_ICO ?= \ - $(foreach w, $(GENERATED_WIDTHS_ICO),$(patsubst %.svg,%-$w.ico,$(notdir $(SVG)))) + $(foreach w, $(GENERATED_WIDTHS_ICO),$(patsubst %.svg,%-$w.ico,$(notdir $(PIXMAP_TO_SVG_SRC_SVG)))) GENERATED_IMAGES += $(GENERATED_ICO) endif ifneq ($(filter pdf,$(SVG_GENERATE_FORMATS)),) - GENERATED_PDF ?= $(patsubst %.svg,%.pdf,$(notdir $(SVG))) + GENERATED_PDF ?= $(patsubst %.svg,%.pdf,$(notdir $(PIXMAP_TO_SVG_SRC_SVG))) GENERATED_IMAGES += $(GENERATED_PDF) endif ifneq ($(filter svg,$(SVG_GENERATE_FORMATS)),) - IMAGES += $(notdir $(SVG)) + IMAGES += $(notdir $(PIXMAP_TO_SVG_SRC_SVG)) endif all: $(GENERATED_IMAGES) @@ -50,7 +50,7 @@ clean.images: %.pdf: copied-%.svg export -n DISPLAY; inkscape --export-filename="$@" $< -copied-%.svg: $(SVG) +copied-%.svg: $(PIXMAP_TO_SVG_SRC_SVG) @echo $^ cp $(filter %$*.svg, $^) $@.tmp mv $@.tmp $@