Tie LilyPond, lexer and parser together more type-safely.

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index a30fd50705ad8f1c27160b0168de6f35a89c0636..d784760d9c0315dece3669cd71985f28661b88cf 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -14,7 +14,6 @@ MODULE_CXXFLAGS= -Wno-pmf-conversions
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES=c c++ executable po help2man
 
-# list parser.hh first: making parser.hh removes parser.cc
 OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
 include $(depth)/make/stepmake.make
@@ -64,9 +63,10 @@ $(outdir)/lilypond: $(outdir)/libstdc++.a
 endif
 
 # force these: Make can't know these have to be generated in advance
-$(outdir)/lily-parser.o: $(outdir)/parser.hh
+$(outdir)/lily-parser.o $(outdir)/parser.o: $(outdir)/parser.hh
 $(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
+$(outdir)/lily-lexer-scheme.o $(outdir)/lily-parser-scheme.o: $(outdir)/parser.hh
 
 ifneq ($(FLEXLEXER_FILE),)
 $(outdir)/FlexLexer.h: $(FLEXLEXER_FILE) $(config_h)
@@ -79,7 +79,6 @@ $(outdir)/parser.cc: $(config_h)
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
-$(outdir)/lexer.ll.o: $(outdir)/version.hh
 $(outdir)/main.o: $(outdir)/version.hh
 $(outdir)/relocate.o: $(outdir)/version.hh
 $(outdir)/warn-scheme.o: $(outdir)/version.hh