($(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico):

[lilypond.git] / lily / GNUmakefile

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 6bf022fc80e57235afaec6de44c70bdbfd83712e..23baceda3faf540ab26ca8209a58276bddc7b166 100644 (file)
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -6,23 +6,31 @@ SUBDIRS = include
 
 MODULE_LIBS=  $(depth)/flower   $(depth)/kpath-guile 
 MODULE_INCLUDES= $(depth)/flower/include 
-MODULE_CXXFLAGS=
+
+# need this to convert between function pointers and member function pointers.
+MODULE_CXXFLAGS= -Wno-pmf-conversions
+
 
 HELP2MAN_EXECS = lilypond
 STEPMAKE_TEMPLATES=c c++ executable po help2man
 
-OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh )
+# list parser.hh first: making parser.hh removes parser.cc
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
 include $(depth)/make/stepmake.make 
 
 ifeq ($(HAVE_LIBKPATHSEA_SO),no)
-MODULE_LDFLAGS+= $(KPATHSEA_LIBS)
+MODULE_LDFLAGS += $(KPATHSEA_LIBS)
+endif
+ifeq ($(LINK_GXX_STATICALLY),yes)
+MODULE_LDFLAGS += -L$(outdir) -static-libgcc
 endif
 
 
+
 # for profiling, link guile statically:
 #
-# USER_LDFLAGS += -static -lltdl -ldl
+# CONFIG_LDFLAGS += -static -lltdl -ldl
 #
 
 ifeq ($(PLATFORM_WINDOWS),yes)
@@ -31,13 +39,15 @@ O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
-$(builddir)/Documentation/pictures/$(outbase)/lilypond.ico:
-       $(MAKE) -C $(abs-srcdir)/Documentation/pictures
-$(outdir)/lilypond.ico: $(builddir)/Documentation/pictures/$(outbase)/lilypond.ico
+$(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 $< $@ 
-$(builddir)/Documentation/pictures/$(outbase)/ly.ico:
-       $(MAKE) -C $(abs-srcdir)/Documentation/pictures
-$(outdir)/ly.ico: $(builddir)/Documentation/pictures/$(outbase)/ly.ico
+$(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 $< $@ 
 endif
 
@@ -46,6 +56,15 @@ ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *([^"]*"\([^"]+\)"/\1/'
 
 default:
 
+
+$(outdir)/libstdc++.a:
+       rm -f $@
+       ln -s `$(CXX) -print-file-name=libstdc++.a` $(outdir)/
+
+ifeq ($(LINK_GXX_STATICALLY),yes)
+$(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-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
@@ -67,7 +86,6 @@ local-po: $(outdir)/parser.cc
 
 # ugh.  For --srcdir builds, these must exist to satisfy their broken
 # lexer.dep and parser.dep file entries.
-ifneq ($(srcdir), .)
+ifneq ($(configure-srcdir),.)
 .PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
 endif
-