Fix some bugs in the dynamic engraver and PostScript backend

[lilypond.git] / Documentation / pictures / GNUmakefile

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 30873a98e33e431bff5008739ceba7f9eda2ee9f..44ec78bdca0e108288e1a1e2fd8f2c394b94bd8a 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -2,43 +2,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))
-
 EXTRA_DIST_FILES= $(XPM_FILES)
-OUT_DIST_FILES = $(icon) #$(package-icon)
-
-icon = $(outdir)/lilypond.ico
-ICON_SIZES=48 32 16
 
-#$(outdir)/lilypond.ico: platte-lucht-kikker-ly-48.xpm
+lilypond-icon = $(outdir)/lilypond.ico
+ly-icon = $(outdir)/ly.ico
 
 include $(depth)/make/stepmake.make
 
-default: $(icon)
-local-dist: $(icon) # $(package-icon)
-
-$(outdir)/%.ico: $(ICON_SIZES:%=$(outdir)/\%-%.png) $(ICON_SIZES:%=$(outdir)/\%-%-8.png)
-       #convert +adjoin $^ $@
-       icotool --output=$@ --create $^
+ifeq ($(PLATFORM_WINDOWS),yes)
 
-# cancel default rule that breaks transparency
-$(outdir)/%.png: %.xpm
+$(outdir)/%.ico: %.xpm
+       $(PYTHON) $(buildscript-dir)/genicon.py $< $@
 
-$(outdir)/%-48.png: %-48.xpm
-       convert -sample 48 -depth 24 $< $@
-                  
-$(outdir)/%-32.png: %-48.xpm
-       convert -depth 24 -sample 32 $< $@
+default: $(lilypond-icon) $(ly-icon)
 
-$(outdir)/%-16.png: %-48.xpm
-       convert -depth 24 -sample 16 $< $@
-
-$(outdir)/%-8.png: $(outdir)/%.png
-       convert -depth 8 $< $@
+endif # PLATFORM_WINDOWS
 
+local-dist: $(icon) 
 xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)
-
 local-WWW: $(OUTPNG_FILES)