X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2FGNUmakefile;h=6d9afd770c4ed991e520c84e33d6f1d43029042f;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=2a51dc0474283d7cb52f469e9869a32492fde5bd;hpb=dbb4524af169a9c15e5c7fcfddfa1a4b85dd288d;p=lilypond.git

diff --git a/lily/GNUmakefile b/lily/GNUmakefile
index 2a51dc0474..6d9afd770c 100644
--- a/lily/GNUmakefile
+++ b/lily/GNUmakefile
@@ -2,26 +2,16 @@
 depth = ..
 
 NAME = lilypond
-SUBDIRS = include
 
 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
+MODULE_INCLUDES= $(depth)/flower/include
 
 
 HELP2MAN_EXECS = lilypond
 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)
-endif
 ifeq ($(LINK_GXX_STATICALLY),yes)
 MODULE_LDFLAGS += -L$(outdir) -static-libgcc
 endif
@@ -40,16 +30,16 @@ O_FILES += $(outdir)/lilypond.rc.o
 $(outdir)/lilypond: $(outdir)/lilypond.rc.o
 
 $(outdir)/lilypond.rc.o: $(outdir)/lilypond.ico $(outdir)/ly.ico
-$(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico:
-	$(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(top-build-dir)/Documentation/logo/$(outbase)/lilypond.ico:
+	$(MAKE) -C $(top-build-dir)/Documentation/logo
 
-$(outdir)/lilypond.ico: $(top-build-dir)/Documentation/pictures/$(outbase)/lilypond.ico
-	cp $< $@ 
-$(top-build-dir)/Documentation/pictures/$(outbase)/ly.ico:
-	$(MAKE) -C $(top-build-dir)/Documentation/pictures
+$(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/pictures/$(outbase)/ly.ico
-	cp $< $@ 
+$(outdir)/ly.ico: $(top-build-dir)/Documentation/logo/$(outbase)/ly.ico
+	cp $< $@
 endif
 
 ETAGS_FLAGS += --regex='{c++}/^LY_DEFINE *(\([^,]+\)/\1/'
@@ -60,16 +50,19 @@ default:
 
 $(outdir)/libstdc++.a:
 	rm -f $@
-	ln -s `$(CXX) -print-file-name=libstdc++.a` $(outdir)/
+	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-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)
@@ -79,15 +72,16 @@ endif
 $(outdir)/lexer.cc: $(config_h)
 $(outdir)/parser.cc: $(config_h)
 
+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)/kpath.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
-
-# ugh.  For --srcdir builds, these must exist to satisfy their broken
-# lexer.dep and parser.dep file entries.
-ifneq ($(configure-srcdir),.)
-.PRECIOUS: $(outdir)/lexer.cc $(outdir)/parser.cc
-endif