Merge branch 'lilypond/translation' into dev/jmandereau

* lilypond/translation:
  Clean up translated docs makefiles

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index bed4120fb90384d9e6900e0870a3c5eebdfec020..1f4865d0099ae368e4bb01800f97e44921778dc2 100644 (file)
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,6 +1,3 @@
-# cancel the rule that generates .n[o lilypond images t]exi files
-$(outdir)/%.nexi: $(ITELY_FILES) $(ITEXI_FILES)
-
 $(outdir)/%/index.html: $(outdir)/%.texi
        mkdir -p $(dir $@)
        -$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
@@ -14,7 +11,7 @@ $(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)
+$(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 $(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 

diff --git a/make/doclang-targets.make b/make/doclang-targets.make
index 09a6face3e5904bd2b3c40f4047af871c026a1e4..4f4750c9a72d6c666be1913889b5e0ad7b339222 100644 (file)
--- a/make/doclang-targets.make
+++ b/make/doclang-targets.make
@@ -6,13 +6,5 @@ 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:
-       rm -rf $(outdir)/lilypond*
-
-web-clean: clean
-       $(MAKE) out=www local-WWW-clean
-
 doc-po:
        $(MAKE) -C $(depth)/Documentation/po out=www messages