Simplify names of favicons

All of the icons are square, only providing the size in one direction is enough. This change lets us avoid some unnecessary complexity in the Makefile.
2026-08-29 16:40:26 +08:00 · 2022-12-22 14:02:04 +01:00
parent c8d37ae8bd
commit 9e9d5ef17d
20 changed files with 25 additions and 25 deletions
@@ -7,22 +7,22 @@ IOS_3X_SIZES := 60 87 120 180
 ALL_IOS_SIZES := $(IOS_1X_SIZES) $(IOS_2X_SIZES) $(IOS_3X_SIZES)

 ALL_SIZES := $(BROWSER_SIZES) $(ANDROID_SIZES) $(ALL_IOS_SIZES)
-ALL_ICONS := $(foreach SIZE, $(ALL_SIZES), novnc-$(SIZE)x$(SIZE).png)
+ALL_ICONS := $(ALL_SIZES:%=novnc-%.png)

 all: $(ALL_ICONS)

-novnc-16x16.png: novnc-icon-sm.svg
+novnc-16.png: novnc-icon-sm.svg
 	convert -density 90 \
 		-background transparent "$<" "$@"
-novnc-24x24.png: novnc-icon-sm.svg
+novnc-24.png: novnc-icon-sm.svg
 	convert -density 135 \
 		-background transparent "$<" "$@"
-novnc-32x32.png: novnc-icon-sm.svg
+novnc-32.png: novnc-icon-sm.svg
 	convert -density 180 \
 		-background transparent "$<" "$@"

 novnc-%.png: novnc-icon.svg
-	convert -density $$[`echo $* | cut -d x -f 1` * 90 / 48] \
+	convert -density $$[`echo $*` * 90 / 48] \
 		-background transparent "$<" "$@"

 clean: