X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=4d596327b0902e926e8add1ce6916494986711b0;hb=94dc81b1820c38ffb09ff47227d76b59cc6dd69c;hp=8d2e91a70a9277d977c9b3b1e54f2acfb5d37f2a;hpb=2f6e65324e5fc909fc8a9d481e661dccc6dab704;p=lilypond.git diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 8d2e91a70a..4d596327b0 100644 --- a/lily/GNUmakefile +++ b/lily/GNUmakefile @@ -5,7 +5,7 @@ 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 @@ -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/'