X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fpictures%2FGNUmakefile;h=438389f944b8e088354abf71a7cd64f126b7b8d6;hb=4cf1c1f0def359889bf9dc326cd6f7ec6edceecd;hp=7490fd6a5974b6be7d154a95209df4d5abf99241;hpb=0fcd8c283c45644a92d2308f1cd0d82a1e63380b;p=lilypond.git

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 7490fd6a59..438389f944 100644
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -1,45 +1,24 @@
 depth = ../..
 
 STEPMAKE_TEMPLATES=documentation
-XPM_FILES=$(wildcard *.xpm)
-OUTGIF_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.gif))
-OUTPNG_FILES = $(addprefix $(outdir)/,$(XPM_FILES:.xpm=.png))
-
+XPM_FILES=$(call src-wildcard,*.xpm)
 EXTRA_DIST_FILES= $(XPM_FILES)
 
-ifeq ($(PLATFORM_WINDOWS),yes)
-OUT_DIST_FILES = $(icon) # $(package-icon)
-
-icon = $(outdir)/lilypond.ico
-ICON_SIZES=48 32 16
+lilypond-icon = $(outdir)/lilypond.ico
+ly-icon = $(outdir)/ly.ico
 
-#$(outdir)/lilypond.ico: platte-lucht-kikker-ly-48.xpm
-
-$(outdir)/%.ico: $(ICON_SIZES:%=$(outdir)/\%-%.png) $(ICON_SIZES:%=$(outdir)/\%-%-8.png)
-	#convert +adjoin $^ $@
-	icotool --output=$@ --create $^
+include $(depth)/make/stepmake.make
 
-# cancel default rule that breaks transparency
-$(outdir)/%.png: %.xpm
+ifeq ($(PLATFORM_WINDOWS),yes)
 
-$(outdir)/%-48.png: %-48.xpm
-	convert -sample 48 -depth 24 $< $@
-		   
-$(outdir)/%-32.png: %-48.xpm
-	convert -depth 24 -sample 32 $< $@
+$(outdir)/%.ico: %.xpm
+	$(PYTHON) $(buildscript-dir)/genicon.py $< $@
 
-$(outdir)/%-16.png: %-48.xpm
-	convert -depth 24 -sample 16 $< $@
+default: $(lilypond-icon) $(ly-icon)
 
-$(outdir)/%-8.png: $(outdir)/%.png
-	convert -depth 8 $< $@
 endif # PLATFORM_WINDOWS
 
-include $(depth)/make/stepmake.make
-
-default: $(icon)
-local-dist: $(icon) # $(package-icon)
+local-dist: $(icon) 
 xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)
-local-WWW: $(OUTPNG_FILES)
-
+local-WWW-1: $(OUTPNG_FILES)