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.

app/images/icons/Makefile

@@ -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:

vnc.html

@@ -18,20 +18,20 @@
     <meta charset="utf-8">
 
     <!-- Icons (see app/images/icons/Makefile for what the sizes are for) -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
-    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24x24.png">
-    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32x32.png">
-    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48x48.png">
-    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64x64.png">
-    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72x72.png">
-    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96x96.png">
-    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144x144.png">
-    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192x192.png">
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
+    <link rel="icon" sizes="24x24" type="image/png" href="app/images/icons/novnc-24.png">
+    <link rel="icon" sizes="32x32" type="image/png" href="app/images/icons/novnc-32.png">
+    <link rel="icon" sizes="48x48" type="image/png" href="app/images/icons/novnc-48.png">
+    <link rel="icon" sizes="64x64" type="image/png" href="app/images/icons/novnc-64.png">
+    <link rel="icon" sizes="72x72" type="image/png" href="app/images/icons/novnc-72.png">
+    <link rel="icon" sizes="96x96" type="image/png" href="app/images/icons/novnc-96.png">
+    <link rel="icon" sizes="144x144" type="image/png" href="app/images/icons/novnc-144.png">
+    <link rel="icon" sizes="192x192" type="image/png" href="app/images/icons/novnc-192.png">
     <!-- Firefox currently mishandles SVG, see #1419039
     <link rel="icon" sizes="any" type="image/svg+xml" href="app/images/icons/novnc-icon.svg">
     -->
     <!-- Repeated last so that legacy handling will pick this -->
-    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16x16.png">
+    <link rel="icon" sizes="16x16" type="image/png" href="app/images/icons/novnc-16.png">
 
     <!-- Apple iOS Safari settings -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
@@ -39,17 +39,17 @@
     <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
 
     <!-- @2x -->
-    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40x40.png">
-    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58x58.png">
-    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80x80.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
-    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152x152.png">
-    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167x167.png">
+    <link rel="apple-touch-icon" sizes="40x40" type="image/png" href="app/images/icons/novnc-40.png">
+    <link rel="apple-touch-icon" sizes="58x58" type="image/png" href="app/images/icons/novnc-58.png">
+    <link rel="apple-touch-icon" sizes="80x80" type="image/png" href="app/images/icons/novnc-80.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+    <link rel="apple-touch-icon" sizes="152x152" type="image/png" href="app/images/icons/novnc-152.png">
+    <link rel="apple-touch-icon" sizes="167x167" type="image/png" href="app/images/icons/novnc-167.png">
     <!-- @3x -->
-    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60x60.png">
-    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87x87.png">
-    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120x120.png">
-    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180x180.png">
+    <link rel="apple-touch-icon" sizes="60x60" type="image/png" href="app/images/icons/novnc-60.png">
+    <link rel="apple-touch-icon" sizes="87x87" type="image/png" href="app/images/icons/novnc-87.png">
+    <link rel="apple-touch-icon" sizes="120x120" type="image/png" href="app/images/icons/novnc-120.png">
+    <link rel="apple-touch-icon" sizes="180x180" type="image/png" href="app/images/icons/novnc-180.png">
 
     <!-- Stylesheets -->
     <link rel="stylesheet" href="app/styles/base.css">