optimize width for 800x600, width=760px (continued).

[lilypond.git] / Documentation / pictures / GNUmakefile

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index b1e9ee9d1eded90fcf5a117540355c2cdacb0599..a156a106c7406fc91e0daf2ecf419ce17ac2abbc 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -10,11 +10,13 @@ EXTRA_DIST_FILES= $(XPM_FILES)
 include $(depth)/make/stepmake.make
 
 ifeq ($(PLATFORM_WINDOWS),yes)
-OUT_DIST_FILES = $(icon) # $(package-icon)
+OUT_DIST_FILES = $(lilypond-icon) $(ly-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)
@@ -24,20 +26,20 @@ $(outdir)/%.ico: $(ICON_SIZES:%=$(outdir)/\%-%.png) $(ICON_SIZES:%=$(outdir)/\%-
 # cancel default rule that breaks transparency
 $(outdir)/%.png: %.xpm
 
-$(outdir)/%-48.png: %-48.xpm
+$(outdir)/%-48.png: %.xpm
        convert -sample 48 -depth 24 $< $@
                   
-$(outdir)/%-32.png: %-48.xpm
+$(outdir)/%-32.png: %.xpm
        convert -depth 24 -sample 32 $< $@
 
-$(outdir)/%-16.png: %-48.xpm
+$(outdir)/%-16.png: %.xpm
        convert -depth 24 -sample 16 $< $@
 
 $(outdir)/%-8.png: $(outdir)/%.png
        convert -depth 8 $< $@
 endif # PLATFORM_WINDOWS
 
-default: $(icon)
+default: $(lilypond-icon) $(ly-icon)
 local-dist: $(icon) # $(package-icon)
 xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)