From: pabs <pabs@1f10aa63-cdf2-0310-b900-c93c546f37ac>
Date: Sat, 10 Feb 2007 01:04:50 +0000 (+0000)
Subject: Use png2ico and allow building icons for any sif file. Patch partly by Dmitriy Pomera... 
X-Git-Url: https://git.pterodactylus.net/?a=commitdiff_plain;h=c441f95936e8e9d8f0f691a4866d3d2f9c832fab;p=synfig.git

Use png2ico and allow building icons for any sif file. Patch partly by Dmitriy Pomerantsev (Atrus).


git-svn-id: http://svn.voria.com/code@236 1f10aa63-cdf2-0310-b900-c93c546f37ac
---

diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am
index 7ad5eb8..deec44c 100644
--- a/synfig-studio/trunk/images/Makefile.am
+++ b/synfig-studio/trunk/images/Makefile.am
@@ -18,19 +18,14 @@ SUFFIXES=.sif .tif .png
 
 #.SUFFIXES: $(SUFFIXES)
 
-PNGTOICO=pngtoico
-CONVERT=convert
-
-sif_icon.ico: $(srcdir)/sif_icon.sif
-	-$(SYNFIG) $< -w 16 -h 16 -o sif_icon_16.png $< -w 32 -h 32 -o sif_icon_32.png $< -w 64 -h 64 -o sif_icon_64.png
-	$(CONVERT) sif_icon_16.png sif_icon_16.gif
-	$(CONVERT) sif_icon_32.png sif_icon_32.gif
-	$(CONVERT) sif_icon_64.png sif_icon_64.gif
-	$(CONVERT) sif_icon_16.gif sif_icon_16.png
-	$(CONVERT) sif_icon_32.gif sif_icon_32.png
-	$(CONVERT) sif_icon_64.gif sif_icon_64.png
-	$(PNGTOICO) sif_icon_64.png > $@
-#	$(PNGTOICO) sif_icon_16.png sif_icon_32.png sif_icon_64.png > $@
+PNGTOICO=png2ico
+
+.sif.ico:
+	$(SYNFIG) $< -w 16 -h 16 -o $*-16x16.png $< -w 32 -h 32 -o $*-32x32.png $< -w 64 -h 64 -o $*-64x64.png
+	p2i=`which $(PNGTOICO)`
+	cp -f $${p2i}.* ./
+	$(PNGTOICO) $@ $*-16x16.png $*-32x32.png $*-64x64.png
+	rm -f ./$(PNGTOICO).*
 
 clean:
 	$(RM) $(CLEANFILES)