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

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 24c14b1ec8..8e8025db6d 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -4,21 +4,39 @@ depth = ..
 NAME = lilypond
 SUBDIRS = include
 
-MODULE_LIBS=$(depth)/flower 
-MODULE_INCLUDES= $(depth)/flower/include
-MODULE_CXXFLAGS= 
-
+MODULE_LIBS= $(depth)/flower  $(depth)/ttftool $(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 
 
+ifeq ($(HAVE_LIBKPATHSEA_SO),no)
+MODULE_LDFLAGS+= $(KPATHSEA_LIBS)
+endif
+
+
 # for profiling, link guile statically:
 #
 # USER_LDFLAGS += -static -lltdl -ldl
 #
 
+ifeq ($(PLATFORM_WINDOWS),yes)
+WINDRES_FLAGS += -DLilyPond=1
+O_FILES += $(outdir)/lilypond.rc.o
+$(outdir)/lilypond: $(outdir)/lilypond.rc.o
+
+$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico
+$(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/'
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 
@@ -26,16 +44,24 @@ 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
 
+$(outdir)/FlexLexer.h: $(FLEXLEXER_PATH)/FlexLexer.h
+	cp $<  $@
+
+
+
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
 
+local-po: $(outdir)/parser.cc
+
 # ugh.  For --srcdir builds, these must exist to satisfy their broken
 # lexer.dep and parser.dep file entries.
 ifneq ($(srcdir), .)
 .PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
 endif
+