* lily/parser.yy (relative_music): whoops. All \relative were off

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index e40277fe3c771e4ba45816926f5a38f38b6db621..e1be486358a30798bd72dcaf55e212f9b1b435b9 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -1,5 +1,3 @@
-# title           makefile for lilypond
-# file    lily/Makefile 
 
 depth = ..
 
@@ -8,20 +6,34 @@ SUBDIRS = include
 
 MODULE_LIBS=$(depth)/flower 
 MODULE_INCLUDES= $(depth)/flower/include
-MODULE_CXXFLAGS=
-HELP2MAN_EXECS = lilypond
+MODULE_CXXFLAGS= 
+
 
+HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
 include $(depth)/make/stepmake.make 
 
-default: 
+# for profiling, link guile statically:
+#
+# USER_LDFLAGS += -static -lltdl -ldl
+#
+
+ETAGS_FLAGS += -r '/^LY_DEFINE *(\([^,]+\),/\1/'  -r '/^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)/lexer.o: $(outdir)/parser.hh
-$(outdir)/lily-version.o: $(outdir)/version.hh
+$(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
+
+$(outdir)/kpath.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
+$(outdir)/lily-version.o: $(outdir)/version.hh
 
+# 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