X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=3b13b8a6d9dabbbd6be1dee2ef85cde3ebe37910;hb=a1425535784d3332f1726c2ccbc7b4b975b79922;hp=2a51dc0474283d7cb52f469e9869a32492fde5bd;hpb=dbb4524af169a9c15e5c7fcfddfa1a4b85dd288d;p=lilypond.git diff --git a/lily/GNUmakefile b/lily/GNUmakefile index 2a51dc0474..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) @@ -44,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/'