X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Fdoclang-rules.make;h=fdbe237533f1bd06f676ebcac1fbaef98573a6b6;hb=db1b4bee7d0792351e368e776f197b1bca7050cb;hp=bda2797f7a0892fefe0659cf0ec010b3b58e05dc;hpb=5479ee9877d8e418aefd1010bd786fd3315dccbd;p=lilypond.git

diff --git a/make/doclang-rules.make b/make/doclang-rules.make
index bda2797f7a..fdbe237533 100644
--- a/make/doclang-rules.make
+++ b/make/doclang-rules.make
@@ -1,14 +1,16 @@
-$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/version.texi
+$(outdir)/%/index.html: $(outdir)/%.texi $(outdir)/%.xref-map $(OUT_PNG_IMAGES) $(outdir)/version.itexi
 	mkdir -p $(dir $@)
-	-$(MAKEINFO) -P $(outdir) --output=$(outdir)/$* --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
+	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$(dir $@) --prefix=index --split=section $(TEXI2HTML_INIT) $<
+	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
-$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/version.texi
-	-$(MAKEINFO) -P $(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $< 
+$(outdir)/%-big-page.html: $(outdir)/%.texi $(outdir)/%.xref-map $(OUT_PNG_IMAGES) $(outdir)/version.itexi
+	$(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
+	cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
-$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.texi
-	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(ISOLANG) $<
+$(outdir)/%.pdftexi: $(outdir)/%.texi $(outdir)/version.itexi
+	$(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
 
-$(outdir)/%.pdf: $(outdir)/%.pdftexi
+$(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi
 	cd $(outdir); texi2pdf $(TEXI2PDF_FLAGS) $(TEXINFO_PAPERSIZE_OPTION) $(notdir $*).pdftexi
 
 $(outdir)/version.%: $(top-src-dir)/VERSION
@@ -16,8 +18,16 @@ $(outdir)/version.%: $(top-src-dir)/VERSION
 	echo $(TOPLEVEL_VERSION)>> $@
 	echo '@end macro'>> $@
 
-$(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
+$(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
+	ln -f $< $@
 
-$(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)
+$(outdir)/%.xref-map: $(outdir)/%.texi
+	$(PYTHON) $(buildscript-dir)/extract_texi_filenames.py $<
+
+# This makes sure lilypond-doc gettext domain has been compiled
+# before lilypond-book runs
+$(TELY_FILES): doc-po
+
+$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 .SECONDARY: