X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=e67a8836758a4a2f9e578bf0b7427218995ba6de;hb=3772b2c7d022122eb9c791bd4a32178e76b97014;hp=0a05b2684968ebd32c77b39796a6290ea2f0e66e;hpb=77add406027ae5afda409a2e77b35852c5fae4f9;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 0a05b26849..e67a883675 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -1,72 +1,92 @@
-# lilypond/GNUmakefile
-#
-# This file helps maintainers to keep their Makefile.am automatically
-# up to date using GNU make features.
-# If you don't have (or run) GNU make, Makefile.am will not be updated
-# automatically when source files are added/removed.
 
-# automake/wild-make should generate this file from Makefile.am.wild
+depth = ..
+
+NAME = lilypond
 
-#ugh
-Makefile=$(wildcard Makefile)
-# are we configured here, or are we using --srcdir
-ifeq ($(Makefile),Makefile)
+MODULE_LIBS=$(depth)/flower
+MODULE_INCLUDES= $(depth)/flower/include
 
-include Makefile
+# need this to convert between function pointers and member function pointers.
+MODULE_CXXFLAGS= -Wno-pmf-conversions 
 
-biltdir=.
 
-else
+HELP2MAN_EXECS = lilypond
+STEPMAKE_TEMPLATES=c c++ executable po help2man
 
-#ugh
-biltdir=../../build/lily
+OUT_DIST_FILES=$(addprefix $(outdir)/,parser.hh parser.cc)
 
-make-in-build: wild-check
-	echo exec $(MAKE) -C $(biltdir)
-	exec $(MAKE) -C $(biltdir)
+include $(depth)/make/stepmake.make
 
-include $(biltdir)/Makefile
+ifeq ($(LINK_GXX_STATICALLY),yes)
+MODULE_LDFLAGS += -L$(outdir) -static-libgcc
+endif
 
-clean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
+CXXFLAGS += -Woverloaded-virtual
 
-dist: wild-check
-	exec $(MAKE) -C $(biltdir) $@
 
-distclean: wild-check
-	exec $(MAKE) -C $(biltdir) $@
+# for profiling, link guile statically:
+#
+# CONFIG_LDFLAGS += -static -lltdl -ldl
+#
 
-lexer.cc: wild-check
-	exec $(MAKE) -C $(biltdir) $@
+ifeq ($(PLATFORM_WINDOWS),yes)
+WINDRES_FLAGS += -DLilyPond=0 -DLY=1
+O_FILES += $(outdir)/lilypond.rc.o
+$(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
-parser.hh: wild-check
-	exec $(MAKE) -C $(biltdir) $@
+$(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
 
-parser.cc: wild-check
-	exec $(MAKE) -C $(biltdir) $@
+$(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
 
-#ugh OMIT_DEPENDENCIES does not seem to work
-.deps/lexer.P:
-	exec $(MAKE) -C $(biltdir) $@
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/logo/$(outbase)/ly.ico
+	cp $< $@
+endif
 
-.deps/parser.P:
-	exec $(MAKE) -C $(biltdir) $@
+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
 
-# Makefile.am.wild: lilypond_SOURCES = $(wildcard *.cc *.ll *.yy)
-# ugh
-CURRENT_lilypond_SOURCES = $(wildcard *.cc lexer.ll parser.yy)
+# force these: Make can't know these have to be generated in advance
+$(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
 
-# ugh: stupid lexer.cc/parser.cc cluttering sourcedir!
-wild-check: check-lilypond-sources
+$(outdir)/lexer.cc: $(config_h)
+$(outdir)/parser.cc: $(config_h)
 
-check-lilypond-sources:
-ifneq ($(lilypond_SOURCES),$(filter-out $(IGNORE_WILDCARDS), $(CURRENT_lilypond_SOURCES)))
-	@echo \"$(lilypond_SOURCES)\"
-	@echo \"$(CURRENT_lilypond_SOURCES)\"
-	@echo  lilypond_SOURCES changed: rerunning make-wild.
-	@-rm -f Makefile.am
-	$(PERL) $(top_srcdir)/bin/wild-perl < Makefile.am.wild > Makefile.am
+ifneq ($(LILYPOND_EXTERNAL_BINARY),)
+$(outdir)/lilypond.1: $(LILYPOND_EXTERNAL_BINARY) $(buildscript-dir)/help2man
+	$(buildscript-dir)/help2man $(LILYPOND_EXTERNAL_BINARY) > $@
 endif
 
+$(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