From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 28 Jul 2009 17:47:50 +0000 (+0200)
Subject: Docs build: restore CHAIN_RULE
X-Git-Tag: release/2.13.4-1~267
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=47e10b6a008f857df1fc6e2a7fd0fe6c7bd9d4b0;p=lilypond.git

Docs build: restore CHAIN_RULE

This also fixes docs build on many configurations.
---

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index ab36a560a9..7a9d67cefa 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -65,6 +65,7 @@ source-links = $(outdir)/source\
  $(foreach manual, $(SPLITTED_HTML_MANUALS), $(outdir)/$(manual)/source)
 
 # Other out files
+
 HTML_PAGE_NAMES= index translations devel
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 OUT_CSS_FILES = $(CSS_FILES:%.css=$(outdir)/%.css)
@@ -84,6 +85,12 @@ endif
 
 include $(depth)/make/stepmake.make
 
+## CHAIN_RULE hack: keep the following line *after* including
+# stepmake.make, so the Internals Reference is built before the
+# Notation Reference, thus providing automatically generated sections
+# of the NR
+TEXI_FILES_FROM_TELY += $(outdir)/internals.texi
+
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
 ###########
diff --git a/make/ly-rules.make b/make/ly-rules.make
index 426352d2b3..19b00f05b2 100644
--- a/make/ly-rules.make
+++ b/make/ly-rules.make
@@ -15,7 +15,9 @@ $(i)
 $(i): 
 endef
 
-$(eval $(firstword $(MASTER_TEXI_FILES)): $(foreach i, $(wordlist 2, $(words $(MASTER_TEXI_FILES)), $(MASTER_TEXI_FILES)),$(CHAIN_RULE)))
+$(eval $(firstword $(TEXI_FILES_FROM_TELY)):\
+ $(foreach i, $(wordlist 2, $(words $(TEXI_FILES_FROM_TELY)),\
+ $(TEXI_FILES_FROM_TELY)),$(CHAIN_RULE)))
 
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
diff --git a/make/ly-vars.make b/make/ly-vars.make
index c3c8a24ba4..612a2b3e40 100644
--- a/make/ly-vars.make
+++ b/make/ly-vars.make
@@ -1,8 +1,7 @@
 # rules for directories with LilyPond files.
 
 TELY_FILES := $(call src-wildcard,*.tely)
-MASTER_TEXI_FILES := $(sort $(TELY_FILES:%.tely=$(outdir)/%.texi))\
- $(OUT_MASTER_TEXI_FILES)
+TEXI_FILES_FROM_TELY += $(TELY_FILES:%.tely=$(outdir)/%.texi)
 
 OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf))