From f6be35e426e21f654ff9e8079df60960a0d787c4 Mon Sep 17 00:00:00 2001 From: John Mandereau Date: Wed, 29 Jul 2009 21:11:49 +0200 Subject: [PATCH] Docs build: really put internals in rules chain This should definitely fix build failures caused by missing automatically generated documentation when lilypond-book compiles the Notation Reference. --- Documentation/GNUmakefile | 12 ++++++------ make/ly-vars.make | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 7a9d67cefa..009dfd13a4 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -50,6 +50,12 @@ TEXINFO_MANUALS = internals\ $(TELY_FILES:%.tely=%)\ $(TEXI_FILES:%.texi=%) +## CHAIN_RULE hack: keep the following line *before* 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 + PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf) UNSPLITTED_HTML_MANUALS = changes @@ -85,12 +91,6 @@ 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-vars.make b/make/ly-vars.make index 612a2b3e40..7d572adb75 100644 --- a/make/ly-vars.make +++ b/make/ly-vars.make @@ -1,7 +1,7 @@ # rules for directories with LilyPond files. TELY_FILES := $(call src-wildcard,*.tely) -TEXI_FILES_FROM_TELY += $(TELY_FILES:%.tely=$(outdir)/%.texi) +TEXI_FILES_FROM_TELY := $(TELY_FILES:%.tely=$(outdir)/%.texi) $(TEXI_FILES_FROM_TELY) OMF_FILES += $(foreach format, html pdf, $(foreach f, $(TELY_FILES), $(outdir)/$(f:.tely=.$(format)).omf)) -- 2.39.5