Update documentation targets

[lilypond.git] / Documentation / pictures / GNUmakefile

diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 5ac3a4beeb2f6a7884f81986c5fe8435cc0f124c..4a8f2eb72f0e28a0f003389cce973b062932da2a 100644 (file)
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -1,47 +1,27 @@
 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)
 
-include $(depth)/make/stepmake.make
-
-ifeq ($(PLATFORM_WINDOWS),yes)
-OUT_DIST_FILES = $(lilypond-icon) $(ly-icon) # $(package-icon)
-
-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: %.xpm
-       convert -sample 48 -depth 24 $< $@
-               
-$(outdir)/%-32.png: %.xpm
-       convert -depth 24 -sample 32 $< $@
+$(outdir)/%.ico: %.xpm
+       $(buildscript-dir)/genicon $< $@
 
-$(outdir)/%-16.png: %.xpm
-       convert -depth 24 -sample 16 $< $@
+default: $(lilypond-icon) $(ly-icon)
 
-$(outdir)/%-8.png: $(outdir)/%.png
-       convert -depth 8 $< $@
 endif # PLATFORM_WINDOWS
 
-default: $(lilypond-icon) $(ly-icon)
-local-dist: $(icon) # $(package-icon)
+local-dist: $(icon) 
 xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)
-local-WWW: $(OUTPNG_FILES)
 
+ifeq ($(out),www)
+local-WWW-1: $(OUTPNG_FILES)
+endif