* Documentation/pictures/lilypond-48.xpm: New file.

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 8d3fb024a062e437b87e357b819797775451c0d6..1e07662bacff13601de67884581daf47a4887ca0 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -31,8 +31,10 @@ O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico
-$(outdir)/lilypond.ico: $(abs-srcdir)/Documentation/pictures/lelie-logo.xpm
-       convert $< $@ 
+$(builddir)/Documentation/pictures/$(outbase)/lilypond.ico:
+       $(MAKE) -C $(abs-srcdir)/Documentation/pictures
+$(outdir)/lilypond.ico: $(builddir)/Documentation/pictures/$(outbase)/lilypond.ico
+       cp $< $@ 
 endif
 
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
@@ -45,7 +47,6 @@ $(outdir)/lily-parser.o: $(outdir)/parser.hh
 $(outdir)/lily-lexer.o: $(outdir)/parser.hh
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
-
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh