X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=3b13b8a6d9dabbbd6be1dee2ef85cde3ebe37910;hb=ba824abf873d98c5afa9f8236beb85929cec0c03;hp=f1a5535fa0f469f657fd986bb4149e93a9d4eec9;hpb=207c3df3b77d5ec25d7db3bbc6ba830d12ee9f85;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index f1a5535fa0..3b13b8a6d9 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -5,10 +5,10 @@ NAME = lilypond
 SUBDIRS = include
 
 MODULE_LIBS=$(depth)/flower
-MODULE_INCLUDES= $(depth)/flower/include 
+MODULE_INCLUDES= $(depth)/flower/include
 
 # need this to convert between function pointers and member function pointers.
-MODULE_CXXFLAGS= -Wno-pmf-conversions
+MODULE_CXXFLAGS= -Wno-pmf-conversions 
 
 
 HELP2MAN_EXECS = lilypond
@@ -17,7 +17,7 @@ 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 
+include $(depth)/make/stepmake.make
 
 ifeq ($(HAVE_LIBKPATHSEA_SO),no)
 MODULE_LDFLAGS += $(KPATHSEA_LIBS)
@@ -26,6 +26,7 @@ ifeq ($(LINK_GXX_STATICALLY),yes)
 MODULE_LDFLAGS += -L$(outdir) -static-libgcc
 endif
 
+CXXFLAGS += -Woverloaded-virtual
 
 
 # for profiling, link guile statically:
@@ -43,12 +44,12 @@ $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
 	$(MAKE) -C $(top-build-dir)/Documentation/pictures
 
 $(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
-	cp $< $@ 
+	cp $< $@
 $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
 	$(MAKE) -C $(top-build-dir)/Documentation/pictures
 
 $(outdir)/ly.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico
-	cp $< $@ 
+	cp $< $@
 endif
 
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
@@ -71,11 +72,12 @@ $(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
 $(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
 
 ifneq ($(FLEXLEXER_FILE),)
-$(outdir)/FlexLexer.h: $(FLEXLEXER_FILE)
+$(outdir)/FlexLexer.h: $(FLEXLEXER_FILE) $(config_h)
 	cp $< $@
 endif
 
-
+$(outdir)/lexer.cc: $(config_h)
+$(outdir)/parser.cc: $(config_h)
 
 $(outdir)/general-scheme.o: $(outdir)/version.hh
 $(outdir)/kpath.o: $(outdir)/version.hh