X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=04ad56acf4a2dfa80adad517e569933d2576eb2c;hb=4d8e2cf781aced3c294ccfad7179951f8561f856;hp=d81ea7813cdeaa1d58ea31c889d80a5a5e3009fd;hpb=686e65bae2d0659995dac27a5f393b545f42e6a0;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index d81ea7813c..04ad56acf4 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -1,26 +1,89 @@
-# title	   makefile for lilypond
-# file	   lily/Makefile 
 
 depth = ..
 
 NAME = lilypond
 SUBDIRS = include
 
-MODULE_LIBS=$(depth)/flower 
-MODULE_INCLUDES= $(depth)/flower/include
-MODULE_CXXFLAGS=
+MODULE_LIBS=  $(depth)/flower   $(depth)/kpath-guile 
+MODULE_INCLUDES= $(depth)/flower/include 
+
+# 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
 
-STEPMAKE_TEMPLATES= c++ executable po help2man
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.cc parser.hh )
 
 include $(depth)/make/stepmake.make 
 
-default: 
+ifeq ($(HAVE_LIBKPATHSEA_SO),no)
+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
+#
+
+ifeq ($(PLATFORM_WINDOWS),yes)
+WINDRES_FLAGS += -DLilyPond=0 -DLY=1
+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
+	cp $< $@ 
+$(builddir)/Documentation/pictures/$(outbase)/ly.ico:
+	$(MAKE) -C $(abs-srcdir)/Documentation/pictures
+$(outdir)/ly.ico: $(builddir)/Documentation/pictures/$(outbase)/ly.ico
+	cp $< $@ 
+endif
+
+ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
+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)/my-lily-parser.o: $(outdir)/parser.hh
-$(outdir)/my-lily-lexer.o: $(outdir)/parser.hh
-$(outdir)/lexer.o: $(outdir)/parser.hh
+$(outdir)/lily-parser.o: $(outdir)/parser.hh
+$(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
+$(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
+
+ifneq ($(FLEXLEXER_PATH),)
+$(outdir)/FlexLexer.h: $(FLEXLEXER_PATH)/FlexLexer.h
+	cp $<  $@
+endif
+
+
+
+$(outdir)/general-scheme.o: $(outdir)/version.hh
+$(outdir)/kpath.o: $(outdir)/version.hh
+$(outdir)/lily-guile.o: $(outdir)/version.hh
 $(outdir)/lily-version.o: $(outdir)/version.hh
 
+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), .)
+.PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
+endif
+