From e5b577bbe6dccb64e2531adb0024b3a77c1ea937 Mon Sep 17 00:00:00 2001 From: Julien Rioux Date: Sat, 14 Sep 2013 21:25:45 +0200 Subject: [PATCH] Build: Explicit dependency on generated version.itexi. Part of issue 3562: Build everything on first pass of make doc http://code.google.com/p/lilypond/issues/detail?id=3562 --- Documentation/GNUmakefile | 2 +- make/doc-i18n-root-rules.make | 2 +- make/doc-i18n-root-targets.make | 4 ++-- stepmake/stepmake/texinfo-rules.make | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile index 407bce6191..fb9ed95bda 100644 --- a/Documentation/GNUmakefile +++ b/Documentation/GNUmakefile @@ -205,7 +205,7 @@ $(OUT_TXT_FILES:%.txt=%.html): $(outdir)/%.html: $(outdir)/%.txt $(buildscript-dir)/text2html $< # Explicitly list the dependencies on generated content -$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi $(outdir)/weblinks.itexi +$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi $(outdir)/weblinks.itexi $(outdir)/version.itexi ifeq ($(out),www) ## Extra images dependencies diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make index 43a2b78278..a86b198fe3 100644 --- a/make/doc-i18n-root-rules.make +++ b/make/doc-i18n-root-rules.make @@ -2,7 +2,7 @@ .SUFFIXES: .html .info .texi .texinfo # Explicitly list the dependencies on generated content -$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi $(outdir)/weblinks.itexi +$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi $(outdir)/weblinks.itexi $(outdir)/version.itexi $(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html: $(outdir)/%/index.html $(TRANSLATION_LILY_IMAGES) mkdir -p $(dir $@) diff --git a/make/doc-i18n-root-targets.make b/make/doc-i18n-root-targets.make index cd5001174a..875617a503 100644 --- a/make/doc-i18n-root-targets.make +++ b/make/doc-i18n-root-targets.make @@ -2,10 +2,10 @@ default: ifeq ($(out),www) ifneq ($(NO_PDF_FILES),) -local-WWW-1: $(OUT_TEXINFO_MANUALS) $(MASTER_TEXI_FILES) $(XREF_MAPS_FILES) +local-WWW-1: $(OUT_TEXINFO_MANUALS) $(MASTER_TEXI_FILES) $(XREF_MAPS_FILES) $(TRANSLATION_LILY_IMAGES) endif ifeq ($(NO_PDF_FILES),) -local-WWW-1: $(OUT_TEXINFO_MANUALS) $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES) +local-WWW-1: $(OUT_TEXINFO_MANUALS) $(MASTER_TEXI_FILES) $(PDF_FILES) $(XREF_MAPS_FILES) $(TRANSLATION_LILY_IMAGES) endif local-WWW-2: $(DEEP_HTML_FILES) $(BIG_PAGE_HTML_FILES) $(DOCUMENTATION_LOCALE_TARGET) diff --git a/stepmake/stepmake/texinfo-rules.make b/stepmake/stepmake/texinfo-rules.make index 838219a673..058276c2c2 100644 --- a/stepmake/stepmake/texinfo-rules.make +++ b/stepmake/stepmake/texinfo-rules.make @@ -24,7 +24,7 @@ endif touch $@ # Copy files while tracking their dependencies. -$(outdir)/%.texi: %.texi +$(outdir)/%.texi: %.texi $(outdir)/version.itexi mkdir -p $(dir $@) $(DO_TEXI_DEP) cp -f $< $@ -- 2.39.2