X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=257a416756ffb9fed70dc83f595e8034df2def8f;hb=205203e856ba125f43b9caa66fc7177db16a6db9;hp=235dc8ad0feb30a1ec827a0432cb29fe37f50e62;hpb=7dfd01bf92557e33629fcc6930a4f97031470fc8;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 235dc8ad0f..257a416756 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -4,16 +4,22 @@ 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
 
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh)
+
 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
@@ -25,14 +31,18 @@ ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 default:
 
 # force these: Make can't know these have to be generated in advance
-$(outdir)/my-lily-parser.o: $(outdir)/parser.hh
-$(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
+$(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
 $(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), .)