X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fimages%2FMakefile.am;h=3a263afa91b4b442c7f8f45e3f9aaaf1e66791fc;hb=22a64c6070122f43a0a5cbd7f7328a758137e76b;hp=7ad5eb8916f41c9ab6d1bc57e33655f2a83461ed;hpb=22ff0047d4d26734fe2adcf524f48523c045cfba;p=synfig.git

diff --git a/synfig-studio/trunk/images/Makefile.am b/synfig-studio/trunk/images/Makefile.am
index 7ad5eb8..3a263af 100644
--- a/synfig-studio/trunk/images/Makefile.am
+++ b/synfig-studio/trunk/images/Makefile.am
@@ -18,19 +18,13 @@ 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
+	cp -f `which $(PNGTOICO)`.* ./
+	$(PNGTOICO) $@ $*-16x16.png $*-32x32.png $*-64x64.png
+	rm -f ./$(PNGTOICO).* $*-16x16.png $*-32x32.png $*-64x64.png
 
 clean:
 	$(RM) $(CLEANFILES)