janware/jw-pkg
1
mirror of ssh://git.janware.com/srv/git/janware/proj/jw-pkg synced 2026-01-15 03:53:32 +01:00
Code Activity

Rename svg.mk to svg-to-pixmap.mk

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2025-12-14 11:58:34 +01:00
commit b350a8f3f0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
make/svg.mk → make/svg-to-pixmap.mk
View file

@ -1,6 +1,6 @@
SVG_GENERATE_FORMATS ?= png svg SVG_GENERATE_FORMATS ?= png svg
SVG ?= $(filter-out copied-%,$(wildcard *.svg)) PIXMAP_TO_SVG_SRC_SVG ?= $(filter-out copied-%,$(wildcard *.svg))
COPIED_SVG = $(addprefix copied-,$(notdir $(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 = $(shell export -n DISPLAY; inkscape -V 2>&1 | sed '/Inkscape/ !d; s/Inkscape *\([0-9.]\+\) .*/\1/')
INKSCAPE_VERSION_MAJOR = $(word 1,$(subst ., ,$(INKSCAPE_VERSION))) INKSCAPE_VERSION_MAJOR = $(word 1,$(subst ., ,$(INKSCAPE_VERSION)))
ifeq ($(INKSCAPE_VERSION_MAJOR),1) ifeq ($(INKSCAPE_VERSION_MAJOR),1)
@ -15,24 +15,24 @@ GENERATED_WIDTHS ?= $(GENERATED_ICON_WIDTHS) $(GENERATED_EXTRA_WIDTHS
ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter png,$(SVG_GENERATE_FORMATS)),)
GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS) GENERATED_WIDTHS_PNG ?= $(GENERATED_WIDTHS)
GENERATED_PNG ?= \ 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) GENERATED_IMAGES += $(GENERATED_PNG)
endif endif
ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter ico,$(SVG_GENERATE_FORMATS)),)
GENERATED_WIDTHS_ICO ?= 16 32 GENERATED_WIDTHS_ICO ?= 16 32
GENERATED_ICO ?= \ 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) GENERATED_IMAGES += $(GENERATED_ICO)
endif endif
ifneq ($(filter pdf,$(SVG_GENERATE_FORMATS)),) 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) GENERATED_IMAGES += $(GENERATED_PDF)
endif endif
ifneq ($(filter svg,$(SVG_GENERATE_FORMATS)),) ifneq ($(filter svg,$(SVG_GENERATE_FORMATS)),)
IMAGES += $(notdir $(SVG)) IMAGES += $(notdir $(PIXMAP_TO_SVG_SRC_SVG))
endif endif
all: $(GENERATED_IMAGES) all: $(GENERATED_IMAGES)
@ -50,7 +50,7 @@ clean.images:
%.pdf: copied-%.svg %.pdf: copied-%.svg
export -n DISPLAY; inkscape --export-filename="$@" $< export -n DISPLAY; inkscape --export-filename="$@" $<
copied-%.svg: $(SVG) copied-%.svg: $(PIXMAP_TO_SVG_SRC_SVG)
@echo $^ @echo $^
cp $(filter %$*.svg, $^) $@.tmp cp $(filter %$*.svg, $^) $@.tmp
mv $@.tmp $@ mv $@.tmp $@