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 f7b95d447869b7b64dd8485cd790c121cb8e8fbf..bed4120fb90384d9e6900e0870a3c5eebdfec020 100644 (file)
--- 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 cddd58615e0891b243b6c9e6934d287ddbd46d1e..09a6face3e5904bd2b3c40f4047af871c026a1e4 100644 (file)
--- 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 96c8bec42da70c33dc97c063fb7eca7c22bf5837..5e4601cb636d5334ece0f1abc0910d14ef54d645 100644 (file)
--- 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)