X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=29a5133f5071b89c4ca42d4cf071304bbeb5aa2d;hb=4516c9ff0c6b1cfc9b0245486a37a90cf487318e;hp=8e8025db6dcab9ec2372cddd6d9b19905c24a444;hpb=d4dfa0ea52d0107c6a810b28e67a742f6f331949;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 8e8025db6d..29a5133f50 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -4,14 +4,14 @@ depth = ..
 NAME = lilypond
 SUBDIRS = include
 
-MODULE_LIBS= $(depth)/flower  $(depth)/ttftool $(depth)/kpath-guile 
+MODULE_LIBS= $(depth)/ttftool $(depth)/flower   $(depth)/kpath-guile 
 MODULE_INCLUDES= $(depth)/flower/include $(depth)/ttftool/include 
 MODULE_CXXFLAGS=
 
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES=c c++ executable po help2man
 
-OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh FlexLexer.h lexer.cc)
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh )
 
 include $(depth)/make/stepmake.make 
 
@@ -26,15 +26,19 @@ endif
 #
 
 ifeq ($(PLATFORM_WINDOWS),yes)
-WINDRES_FLAGS += -DLilyPond=1
+WINDRES_FLAGS += -DLilyPond=0 -DLY=1
 O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
-$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico
+$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
 $(builddir)/Documentation/pictures/$(outbase)/lilypond.ico:
 	$(MAKE) -C $(abs-srcdir)/Documentation/pictures
 $(outdir)/lilypond.ico: $(builddir)/Documentation/pictures/$(outbase)/lilypond.ico
 	cp $< $@ 
+$(builddir)/Documentation/pictures/$(outbase)/ly.ico:
+	$(MAKE) -C $(abs-srcdir)/Documentation/pictures
+$(outdir)/ly.ico: $(builddir)/Documentation/pictures/$(outbase)/ly.ico
+	cp $< $@ 
 endif
 
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
@@ -47,8 +51,10 @@ $(outdir)/lily-parser.o: $(outdir)/parser.hh
 $(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
+ifneq ($(FLEXLEXER_PATH),)
 $(outdir)/FlexLexer.h: $(FLEXLEXER_PATH)/FlexLexer.h
 	cp $<  $@
+endif