Merge branch 'master' of git://git.sv.gnu.org/lilypond

[lilypond.git] / make / doclang-targets.make

diff --git a/make/doclang-targets.make b/make/doclang-targets.make
index c293884d62e1526241878bff223b72b8e5a6e1ad..8366970f1f8b52376de0e42af1b78013bf6dd708 100644 (file)
--- a/make/doclang-targets.make
+++ b/make/doclang-targets.make
@@ -10,26 +10,30 @@ LILYPOND_BOOK_INCLUDES += \
 
 default:
 
-$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
+$(outdir)/%.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
-MAKEINFO = LANG= $(MAKEINFO_PROGRAM) --enable-encoding --force
+MAKEINFO_FLAGS += --force
 
-$(outdir)/lilypond/index.html: $(outdir)/lilypond.nexi $(outdir)/user-ln doc-po
+$(outdir)/%/index.html: $(outdir)/%.nexi $(outdir)/user-ln doc-po
        mkdir -p $(dir $@)
-       -$(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
-       find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/html-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG)
+       -$(MAKEINFO) $(MAKEINFO_FLAGS) -I$(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 
 # we don't make the big page until the whole manual is translated
 # if this happens, we'll have to define local-WWW differently for this language
 #$(outdir)/lilypond.html: $(outdir)/lilypond.nexi
-#      -$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
+#      -$(MAKEINFO) $(MAKEINFO_FLAGS) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
 
 $(outdir)/%.pdf: $(outdir)/%.texi $(outdir)/user-ln doc-po
        $(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
        cd $(outdir); texi2pdf --batch $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
 
-local-WWW: $(outdir)/lilypond.pdf $(outdir)/lilypond/index.html
-       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) lilypond.pdf
+TELY_FILES = $(call src-wildcard,*.tely)
+DEEP_HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%/index.html)
+PDF_FILES = $(TELY_FILES:%.tely=$(outdir)/%.pdf)
+
+local-WWW: $(DEEP_HTML_FILES) $(PDF_FILES)
+       find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/html-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG)
+       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' \) -a -not -type l | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir)
 
 # FIXME
@@ -45,14 +49,14 @@ LINKED_PNGS = henle-flat-gray.png baer-flat-gray.png lily-flat-bw.png
 # symlinking lily-*...
 $(outdir)/user-ln: $(top-build-dir)/Documentation/user/$(outdir)
        touch -mr $(top-build-dir)/Documentation/user/$(outdir) $@
+       $(PYTHON) $(buildscript-dir)/mass-link.py symbolic $(top-build-dir)/Documentation/user/$(outdir) $(outdir) 'lily-*.pdf' 'lily-*.tex' 'lily-*.texi' 'lily-*.ly' 'lily-*.txt' 'lily-*.png' 'henle-flat-gray.*' 'baer-flat-gray.*' 'lily-flat-bw.*' 'context-example.*'
        mkdir -p $(outdir)/lilypond
-       $(PYTHON) $(buildscript-dir)/mass-link.py symbolic $(top-build-dir)/Documentation/user/$(outdir) $(outdir) 'lily-*.pdf' 'lily-*.tex' 'lily-*.texi' 'lily-*.ly' 'lily-*.txt' 'lily-*.png' 'henle-flat-gray.*' 'baer-flat-gray.*' 'lily-flat-bw.*'
        cd $(outdir)/lilypond && $(foreach i, $(LINKED_PNGS), ln -sf ../../$(depth)/Documentation/user/$(i) $(i) &&) true
 
 local-WWW-clean: deep-WWW-clean
 
 deep-WWW-clean:
-       rm -rf $(outdir)/lilypond
+       rm -rf $(outdir)/lilypond*
 
 web-clean: clean
        $(MAKE) out=www local-WWW-clean