X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=make%2Fdoclang-targets.make;h=4fd4bad6948c430cfdc0a5f50813001b3db178a5;hb=d1e8171540c9d40cb0626ed772205963731f792f;hp=6d46749eefd32a6667e675fffcab45e00b5ed592;hpb=8f5cd22af76fcb5c77853a5ede8b94ebef97caef;p=lilypond.git

diff --git a/make/doclang-targets.make b/make/doclang-targets.make
index 6d46749eef..4fd4bad694 100644
--- a/make/doclang-targets.make
+++ b/make/doclang-targets.make
@@ -1,54 +1,10 @@
-# assumes depth and ISOLANG are defined
-
-OUT_ITEXI_FILES = $(ITELY_FILES:%.itely=$(outdir)/%.itexi)
-
-LILYPOND_BOOK_INCLUDES += \
-  -I$(top-src-dir)/Documentation/user \
-  -I$(top-build-dir)/Documentation/user/$(outdir)
-
 default:
 
-$(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
-
-MAKEINFO = LANG=$(ISOLANG) $(MAKEINFO_PROGRAM) --force
-
-$(outdir)/lilypond/index.html: $(outdir)/lilypond.nexi 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)
-
-$(outdir)/lilypond.html: $(outdir)/lilypond.nexi
-	-$(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
-
-local-WWW: png-ln $(outdir)/lilypond.html $(outdir)/lilypond/index.html deep-ln lang-merge
-
-lang-merge:
-	$(foreach i, $(shell find $(outdir) -name '*.html' | xargs grep -L --label="" 'UNTRANSLATED NODE: IGNORE ME'), ln -f $(i) $(i:$(outdir)/%.html=$(depth)/Documentation/user/$(outdir)/%.$(ISOLANG).html) &&) true
-
-png-ln:
-	mkdir -p $(outdir)/lilypond
-	# makeinfo is broken, it MUST have PNGs in output dir
-	# symlinking PNGs...
-	$(foreach i, $(shell find $(depth)/Documentation/user/$(outdir) -maxdepth 1 -name '*.png'), ln -sf ../$(i) $(i:$(depth)/Documentation/user/$(outdir)/%.png=$(outdir)/%.png) &&) true
-	$(foreach i, $(shell find $(depth)/Documentation/user/$(outdir)/lilypond -name '*.png'), ln -sf ../../$(i) $(i:$(depth)/Documentation/user/$(outdir)/%.png=$(outdir)/%.png) &&) true
-
-# Links referred to by Documentation index
-# BROKEN: the following makes broken symlinks
-#LILYPOND_LINKS = Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
-
-
-deep-ln:
-	mkdir -p $(outdir)/lilypond
-	cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\
-		 rm -f $(i) && ln -s lilypond.html $(i) &&) true
-
-local-WWW-clean: deep-WWW-clean
-
-deep-WWW-clean:
-	rm -rf $(outdir)/lilypond
-
-web-clean: clean
-	$(MAKE) out=www local-WWW-clean
+# BIG_PAGE_HTML_FILES is defined differently in each language makefile
+local-WWW: $(DEEP_HTML_FILES) $(PDF_FILES) doc-po $(BIG_PAGE_HTML_FILES)
+	find $(outdir) -name '*.html' | xargs grep -L 'UNTRANSLATED NODE: IGNORE ME' | xargs $(PYTHON) $(buildscript-dir)/html-gettext.py $(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' \) | sed 's!$(outdir)/!!g' | xargs $(PYTHON) $(buildscript-dir)/mass-link.py hard $(outdir) $(top-build-dir)/Documentation/user/$(outdir)
 
 doc-po:
-	$(MAKE) -C $(depth)/Documentation/po messages
+	$(MAKE) -C $(depth)/Documentation/po out=www messages