From: John Mandereau <john.mandereau@gmail.com> Date: Thu, 21 Feb 2008 18:37:22 +0000 (+0100) Subject: Improve translated docs building X-Git-Tag: release/2.11.41-1~26 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=b1b57f36a695de90fd63d85bf8012081e72730cb;p=lilypond.git Improve translated docs building - add ".SECONDARY" target: don't remove intermediate files, otherwise final targets are always outdated; - add prerequisites so that docs are rebuilt if .itelys change. --- diff --git a/make/doclang-rules.make b/make/doclang-rules.make index f7b95d4478..bed4120fb9 100644 --- a/make/doclang-rules.make +++ b/make/doclang-rules.make @@ -13,3 +13,9 @@ $(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/%.pdf: $(outdir)/%.pdftexi cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi + +$(OUT_TEXI_FILES): $(ITELY_FILES) + +$(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES) + +.SECONDARY: diff --git a/make/doclang-targets.make b/make/doclang-targets.make index cddd58615e..09a6face3e 100644 --- a/make/doclang-targets.make +++ b/make/doclang-targets.make @@ -6,7 +6,6 @@ local-WWW: $(DEEP_HTML_FILES) $(PDF_FILES) doc-po $(BIG_PAGE_HTML_FILES) find $(outdir) -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME' | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py --prepend-suffix .$(ISOLANG) hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir) $(TELY_FILES:%.tely=%.pdf) find $(outdir) \( -name 'lily-??????????.png' -o -name 'lily-??????????.ly' \) | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir) - local-WWW-clean: deep-WWW-clean deep-WWW-clean: diff --git a/make/doclang-vars.make b/make/doclang-vars.make index 96c8bec42d..5e4601cb63 100644 --- a/make/doclang-vars.make +++ b/make/doclang-vars.make @@ -2,8 +2,6 @@ LANGS = $(shell $(PYTHON) $(buildscript-dir)/langdefs.py) -OUT_ITEXI_FILES = $(ITELY_FILES:%.itely=$(outdir)/%.itexi) - DOCUMENTATION_INCLUDES = \ -I $(top-src-dir)/Documentation/user \ -I $(top-build-dir)/Documentation/user/$(outdir) @@ -17,5 +15,9 @@ TEXI2PDF_FLAGS += --batch --tidy TEXI2PDF_FLAGS += $(DOCUMENTATION_INCLUDES) TELY_FILES = $(call src-wildcard,*.tely) +OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi) DEEP_HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%/index.html) PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf) + +ITELY_FILES := $(call src-wildcard,*.itely) +ITEXI_FILES := $(call src-wildcard,*.itexi)