Merge branch 'master' into dev/texi2html

[lilypond.git] / Documentation / pictures / GNUmakefile

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 488c762d9be8f7dec00cd36514f87e60a26bcef2..438389f944b8e088354abf71a7cd64f126b7b8d6 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -1,19 +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)
 
+lilypond-icon = $(outdir)/lilypond.ico
+ly-icon = $(outdir)/ly.ico
+
 include $(depth)/make/stepmake.make
 
-gifs: $(OUTGIF_FILES)
-pngs: $(OUTPNG_FILES)
+ifeq ($(PLATFORM_WINDOWS),yes)
 
-# local-WWW: $(OUTGIF_FILES)
-local-WWW: $(OUTPNG_FILES)
+$(outdir)/%.ico: %.xpm
+       $(PYTHON) $(buildscript-dir)/genicon.py $< $@
 
-icon: $(outdir)/lelie_icon.gif
-       cp $< $(depth)/$(outdir)/$(package)-icon.gif
+default: $(lilypond-icon) $(ly-icon)
+
+endif # PLATFORM_WINDOWS
+
+local-dist: $(icon) 
+xgifs: $(OUTGIF_FILES)
+pngs: $(OUTPNG_FILES)
+local-WWW-1: $(OUTPNG_FILES)