logos: Change the naming of the small logo as it is no longer square

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/Makefile b/Makefile
index 2083b269485eb439d0a6ea9432be7cd573a612e5..3b54bcd8014c8b479ccf3d496ca5b7ce53066bb4 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,23 +3,24 @@ STYLES = \
        inverted \
        monochrome
 
-FILES = \
-       logo.svg \
-       logo.pdf \
-       logo-512.png \
-       logo-1024.png \
-       logo-2048.png \
-       logo-4096.png \
-       \
-       logo-small.pdf \
-       logo-small.svg \
-       logo-small-512x512.png \
-       logo-small-1024x1024.png \
-       logo-small-2048x2048.png \
-       logo-small-4096x4096.png
-
-OBJECTS = \
-       $(foreach style,$(STYLES),$(foreach file,$(FILES),$(style)/$(file)))
+LOGOS = \
+       logo \
+       logo-small
+
+LOGO_SIZES = \
+       512 \
+       1024 \
+       2048 \
+       4096
+
+# Render the logos as standalone SVG & PDF
+OBJECTS += \
+       $(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(style)/$(logo).svg)) \
+       $(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(style)/$(logo).pdf))
+
+# Render the logos as PNG in all desired sizes
+OBJECTS += \
+       $(foreach style,$(STYLES),$(foreach logo,$(LOGOS),$(foreach size,$(LOGO_SIZES),$(style)/$(logo)-$(size).png)))
 
 # The favicon only exists in the standard design
 OBJECTS += \
@@ -114,19 +115,19 @@ standard/logo-small.svg: logo-small-standalone.svg
        $(RSVG_CONVERT) --format=png --width=4096 $< > $@
 
 # Converts the small logo to PNG
-%/logo-small-512x512.png: %/logo-small.svg
+%/logo-small-512.png: %/logo-small.svg
        mkdir -p $(dir $@) && \
        $(RSVG_CONVERT) --format=png --width=512 $< > $@
 
-%/logo-small-1024x1024.png: %/logo-small.svg
+%/logo-small-1024.png: %/logo-small.svg
        mkdir -p $(dir $@) && \
        $(RSVG_CONVERT) --format=png --width=1024 $< > $@
 
-%/logo-small-2048x2048.png: %/logo-small.svg
+%/logo-small-2048.png: %/logo-small.svg
        mkdir -p $(dir $@) && \
        $(RSVG_CONVERT) --format=png --width=2048 $< > $@
 
-%/logo-small-4096x4096.png: %/logo-small.svg
+%/logo-small-4096.png: %/logo-small.svg
        mkdir -p $(dir $@) && \
        $(RSVG_CONVERT) --format=png --width=4096 $< > $@