X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=e92486e321c638709c67ade3376c3bab7e63b26f;hb=9087de1c637fc042ae3cbda8174a4ee9131cc523;hp=55eb9704bf90d1673e02d5490e159a421cc6ddf4;hpb=6f67a434a5f3153cd4b8271f6358dd414941d3f3;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 55eb9704bf..e92486e321 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -4,12 +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++ executable po help2man
+STEPMAKE_TEMPLATES=c c++ executable po help2man
+
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh FlexLexer.h lexer.cc)
 
 include $(depth)/make/stepmake.make 
 
@@ -23,6 +25,22 @@ endif
 # USER_LDFLAGS += -static -lltdl -ldl
 #
 
+ifeq ($(PLATFORM_WINDOWS),yes)
+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)/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/'
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 
@@ -30,9 +48,16 @@ default:
 
 # force these: Make can't know these have to be generated in advance
 $(outdir)/lily-parser.o: $(outdir)/parser.hh
-$(outdir)/lily-lexer.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
+
+
+
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
@@ -45,3 +70,4 @@ local-po: $(outdir)/parser.cc
 ifneq ($(srcdir), .)
 .PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
 endif
+