(ly_module_define): only define variable if

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 79a516e0b247b2588e34ec22d15bfe05b5ba7daf..a306551671af3a74cb8a2bafd7cf3e11d189f567 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -1,7 +1,7 @@
 
 depth = ..
 
-NAME = lilypond
+NAME = lilypond-bin
 SUBDIRS = include
 
 MODULE_LIBS=$(depth)/flower 
@@ -9,7 +9,7 @@ MODULE_INCLUDES= $(depth)/flower/include
 MODULE_CXXFLAGS= 
 
 
-HELP2MAN_EXECS = lilypond
+HELP2MAN_EXECS = lilypond-bin
 STEPMAKE_TEMPLATES= c++ executable po help2man
 
 include $(depth)/make/stepmake.make 
@@ -19,9 +19,10 @@ include $(depth)/make/stepmake.make
 # USER_LDFLAGS += -static -lltdl -ldl
 #
 
-ETAGS_FLAGS += -r '/^LY_DEFINE *(\([^,]+\),/\1/'  -r '/^LY_DEFINE *([^,]+, *"\([^"]+\)"/\1/' 
+ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
+ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 
-default: 
+default:
 
 # force these: Make can't know these have to be generated in advance
 $(outdir)/my-lily-parser.o: $(outdir)/parser.hh
@@ -31,3 +32,9 @@ $(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