summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-08-13 20:52:56 -0600
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-08-13 21:25:37 -0600
commitba84ab823dd7f319515115405341bc0c5a974e1a (patch)
treee8ca6a0cbd88ce59eb07569ee0519421a42aabab
parentd9dbf966031d2fdd4957d8020fa5bc1258aa7405 (diff)
parent98cdaf9076a67a7d1262a15c4acb1e92ead7c18d (diff)
Clean up Makefiles
-rw-r--r--Makefile16
1 files changed, 9 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 8449518..3cef32c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,25 @@
## Usage: $(call SVG2PNG,infile,outfile[,width,height,background-color])
##
## ImageMagick: doesn't support transparency
-#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $(if $5,-background $5) $2
-## librsvg: doesn't support <style> element
+#SVG2PNG = convert $1 -format png $(if $3,-resize $3x)$(if $4,$4) $(if $5,-background '$5') $2
+## librsvg: doesn't support <style> element, hints small text poorly
#SVG2PNG = rsvg-convert $1 -o $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,--background-color=$5)
## Inkscape: messes up gradients
-SVG2PNG = inkscape $1 --export-png $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,-b '$5')
+SVG2PNG = DISPLAY= inkscape -z $1 --export-png $2 $(if $3,-w $3) $(if $4,-h $4) $(if $5,-b '$5')
## PNG2ICO
## png2ico: doesn't read PNG transparency properly
#PNG2ICO = png2ico $2 $1
## icotool: has perl dependencies
-PNG2ICO = icotool -c $1 -o $2
+#PNG2ICO = icotool -c $1 -o $2
+## But https://www.archlinux.org/favicon.ico is a PNG, not an ICO
+PNG2ICO = cp $1 $2
#PNGCRUSH = cp $1 $2
PNGCRUSH = pngcrush $1 $2
-all: website \
- logo.png \
+all: \
+ website \
logotype-color-darkbg.png \
logotype-color-lightbg.png \
logotype-grayscale.png \
@@ -37,7 +39,7 @@ website: \
silhouette.png
clean:
- rm -f *.png *.ico
+ rm -f -- *.png *.png
%.raw.png: %.svg Makefile
$(call SVG2PNG,$<,$@)