Commit Diff

Commit:
2c580f18480a34e2b8cad4c3a9be70d74304adbf
From:
Omar Polo <op@omarpolo.com>
Date:
Message:
bundle the images and drop the hard dependency on imagemagick
Actions:
Patch | Tree
commit - c07cd21acad7895d1dd451d4d7179c50704ef34a
commit + 2c580f18480a34e2b8cad4c3a9be70d74304adbf
blob - 4fa513106ee2ac914bdb174de5629dd7e128de9f
blob + 5fd5204b6da63ab344b03715c88855488382886f
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 MDIR =		${HOME}/Mail/gameoftrees
 OUTDIR =	/var/www/marc
 
-.PHONY: all assets images dirs gzip clean
+.PHONY: all assets images dirs gzip clean scaleimgs
 
 all: assets
 	@env MDIR="${MDIR}" OUTDIR="${OUTDIR}" ./gotmarc
@@ -11,16 +11,16 @@ assets: dirs images ${OUTDIR}/style.css
 images: ${OUTDIR}/got@2x.png ${OUTDIR}/got.png ${OUTDIR}/got-tiny@2x.png \
 	${OUTDIR}/got-tiny.png
 
-${OUTDIR}/got@2x.png: got.png
-	cp got.png ${OUTDIR}/got@2x.png
-${OUTDIR}/got.png: got.png
-	convert got.png -resize 200x200 ${OUTDIR}/got.png
-${OUTDIR}/got-tiny@2x.png: got.png
-	convert got.png -resize 128x128 ${OUTDIR}/got-tiny@2x.png
-${OUTDIR}/got-tiny.png: got.png
-	convert got.png -resize 64x64 ${OUTDIR}/got-tiny.png
+${OUTDIR}/got@2x.png: images/got.orig.png
+	cp $? $@
+${OUTDIR}/got.png: images/got.png
+	cp $? $@
+${OUTDIR}/got-tiny@2x.png: images/got-tiny@2x.png
+	cp $? $@
+${OUTDIR}/got-tiny.png: images/got-tiny.png
+	cp $? $@
 ${OUTDIR}/style.css: style.css
-	cp style.css ${OUTDIR}
+	cp $? $@
 
 dirs:
 	@mkdir -p ${OUTDIR}/mail/
@@ -33,3 +33,10 @@ gzip:
 
 clean:
 	rm -rf ${OUTDIR}
+
+# -- maintainer targets --
+
+scaleimgs: images/got.orig.png
+	convert images/got.orig.png -resize 200x200 images/got.png
+	convert images/got.orig.png -resize 128x128 images/got-tiny@2x.png
+	convert images/got.orig.png -resize 64x64 images/got-tiny.png
blob - 25887d6b1054c4a20e3f893c612683e8d687800b
blob + ef1c23676fd9567b63d9f3bed6e496aa84b07437
--- README
+++ README
@@ -8,9 +8,11 @@ Trees mailing list.
 The dependencies are:
 
  - mblaze
- - imagemagick (to resize the got logo)
 
+Optionally, ImageMagick is used to regen the various sizes of the got
+logo in images/.
 
+
 How it works
 ------------
 
blob - 8fbd066279db65e381ce8a21be95c58ac4dfc788 (mode 644)
blob + /dev/null
Binary files got.png and /dev/null differ
blob - /dev/null
blob + bc7ac392c3ec39f7ae48086334c338911aa84351 (mode 644)
Binary files /dev/null and images/got-tiny.png differ
blob - /dev/null
blob + 3b4d8e2edcce85d83110586c0bccfa638a1a2ee7 (mode 644)
Binary files /dev/null and images/got-tiny@2x.png differ
blob - /dev/null
blob + 8fbd066279db65e381ce8a21be95c58ac4dfc788 (mode 644)
Binary files /dev/null and images/got.orig.png differ
blob - /dev/null
blob + 9ab6a68994b92181b7f818a30f352b444f3ee2b0 (mode 644)
Binary files /dev/null and images/got.png differ