X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=abb48fe5ae1324c06f850c6ee4fd4775f2ce606c;hb=c20fff645e325d392d2588721144f4204d0ef9da;hp=b40f17484daf40674bcfd8fad9b05e5ab042a57d;hpb=29d1ad412ee48aa7a3a1666c7ab7af8fd2e2b1bf;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index b40f17484d..abb48fe5ae 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -1,26 +1,87 @@
-# title	   makefile for lilypond
-# file	   lily/Makefile 
 
 depth = ..
 
 NAME = lilypond
-SUBDIRS = include
 
-MODULE_LIBS=$(depth)/lib $(depth)/flower 
-MODULE_INCLUDES=$(depth)/lib/include $(depth)/flower/include 
-MODULE_CXXFLAGS=
+MODULE_LIBS=$(depth)/flower
+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
+
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
+
+include $(depth)/make/stepmake.make
+
+ifeq ($(LINK_GXX_STATICALLY),yes)
+MODULE_LDFLAGS += -L$(outdir) -static-libgcc
+endif
+
+CXXFLAGS += -Woverloaded-virtual
+
+
+# for profiling, link guile statically:
+#
+# CONFIG_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
 
-STEPMAKE_TEMPLATES= c++ executable po help2man
+$(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
+$(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico:
+	$(MAKE) -C $(top-build-dir)/Documentation/logo
 
-include $(depth)/make/stepmake.make 
+$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico
+	cp $< $@
+$(top-build-dir)/Documentation/logo/$(outbase)/ly.ico:
+	$(MAKE) -C $(top-build-dir)/Documentation/logo
+
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/logo/$(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-version.o: $(outdir)/version.hh
-$(outdir)/main.o: $(outdir)/BLURB.hh $(outdir)/COPERTINA.hh $(outdir)/FLAPTEKST.hh
+$(outdir)/lily-parser.o $(outdir)/parser.o: $(outdir)/parser.hh
+$(outdir)/lily-lexer.o: $(outdir)/parser.hh $(outdir)/FlexLexer.h
+$(outdir)/lexer.o: $(outdir)/parser.hh $(outdir)/version.hh
+$(outdir)/lily-lexer-scheme.o \
+  $(outdir)/lily-parser-scheme.o \
+  $(outdir)/parse-scm.o: $(outdir)/parser.hh
 
+ifneq ($(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)/lily-guile.o: $(outdir)/version.hh
+$(outdir)/lily-version.o: $(outdir)/version.hh
+$(outdir)/main.o: $(outdir)/version.hh
+$(outdir)/relocate.o: $(outdir)/version.hh
+$(outdir)/warn-scheme.o: $(outdir)/version.hh
 
+local-po: $(outdir)/parser.cc