]> git.donarmstrong.com Git - lilypond.git/commitdiff
Split WWW target in two stages WWW-1 and WWW-2
authorJohn Mandereau <john.mandereau@gmail.com>
Sun, 1 Jun 2008 13:13:21 +0000 (15:13 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Sun, 1 Jun 2008 13:13:21 +0000 (15:13 +0200)
- split local-WWW too in makefiles;

- local-WWW-1 generates Texinfo source, and Info and PDF output;
local-WWW-2 generates HTML output;

- also change WWW-post to a toplevel target, because it needn't recurse
into subdirectories.

This change allows collecting node trees from all Texinfo sources at
the end of local-WWW-1, so they are available to texi2html in
local-WWW-2.

23 files changed:
Documentation/GNUmakefile
Documentation/bibliography/GNUmakefile
Documentation/de/GNUmakefile
Documentation/es/GNUmakefile
Documentation/fr/GNUmakefile
Documentation/misc/GNUmakefile
Documentation/pictures/GNUmakefile
Documentation/topdocs/GNUmakefile
Documentation/user/GNUmakefile
GNUmakefile.in
input/lsr/GNUmakefile
make/doclang-rules.make
make/doclang-targets.make
make/doclang-vars.make
make/ly-rules.make
make/lysdoc-rules.make
make/lysdoc-targets.make
make/lysdoc-vars.make
make/mutopia-targets.make
stepmake/stepmake/documentation-targets.make
stepmake/stepmake/generic-targets.make
stepmake/stepmake/texinfo-targets.make
stepmake/stepmake/topdocs-targets.make

index 15b6a6f297bec3e562a6497df84475d4bf553f63..15b7601905eead940a1bf49f97f8627a6fa392ea 100644 (file)
@@ -13,7 +13,7 @@ include $(depth)/make/stepmake.make
 
 default: local-doc
 
-local-WWW: txt-to-html $(outdir)/index.html $(outdir)/devel.html
+local-WWW-2: txt-to-html $(outdir)/index.html $(outdir)/devel.html
 
 local-WWW-clean: deep-WWW-clean
 
index 4a7bab0111c2d95cbecf46a17422039dce875ece..89eb2d0bcbdde74bedc256b49a832e3edb5bbebd 100644 (file)
@@ -1,4 +1,4 @@
-# Documentation/tex/Makefile
+# Documentation/bibliography/Makefile
 
 depth=../..
 
@@ -18,10 +18,10 @@ ps: $(PS_FILES)
 # urg
 default:
 
-GENHTMLS = engraving colorado  computer-notation
+GENHTMLS = engraving colorado computer-notation
 OUTGENHTMLS = $(addprefix $(outdir)/, $(GENHTMLS:%=%.html))
 
-local-WWW: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html) index.html)
+local-WWW-2: $(addprefix $(outdir)/, $(BIB_FILES:.bib=.html) index.html)
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
index eee4de1f5186e78f2ae735f7c1a7b90ec74a60c9..6c6f34ad9ae76c96fc0cf5cae4a9d786809e6343 100644 (file)
@@ -5,7 +5,7 @@ STEPMAKE_TEMPLATES = documentation
 
 include $(depth)/make/stepmake.make
 
-local-WWW: lang-merge
+local-WWW-2: lang-merge
 
 lang-merge: $(outdir)/index.html
        ln -f $(outdir)/index.html $(depth)/Documentation/$(outdir)/index.$(ISOLANG).html
index bc58051120e9346cf93d27aaa1e778e36c1e55f6..71d45d60fae8fea924966929f975551a6ea25319 100644 (file)
@@ -5,7 +5,7 @@ STEPMAKE_TEMPLATES = documentation
 
 include $(depth)/make/stepmake.make
 
-local-WWW: lang-merge
+local-WWW-2: lang-merge
 
 lang-merge: $(outdir)/index.html
        ln -f $(outdir)/index.html $(depth)/Documentation/$(outdir)/index.$(ISOLANG).html
index 003d9c02bdd3436c73ae79351ed3ecfdd87f0572..29c968e9256368eadaddd157310be8321018540c 100644 (file)
@@ -5,7 +5,7 @@ STEPMAKE_TEMPLATES = documentation
 
 include $(depth)/make/stepmake.make
 
-local-WWW: lang-merge
+local-WWW-2: lang-merge
 
 lang-merge: $(outdir)/index.html
        ln -f $(outdir)/index.html $(depth)/Documentation/$(outdir)/index.$(ISOLANG).html
index b84aa786b88b3e0e7c9cd72bd6e7adf1f34131e5..bb3beb4998c5b63018cc8d6bd322ef457452b74d 100644 (file)
@@ -14,7 +14,7 @@ default: local-doc
 #urg default local-WWW target uses footify before its time;
 # must add footify with txt-to-html target
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(TEXTS)))
-##local-WWW: $(OUT_TXT_FILES) $(OUT_HTMLFILES) txt-to-html
+##local-WWW-2: $(OUT_TXT_FILES) $(OUT_HTMLFILES) txt-to-html
 
 copy-for-me:
        $(foreach a, $(README_TOP_FILES), cp ../$(a) $(outdir)/$(a).txt && ) true
index 6665721085fd801f3c05c859c171f22d1ee13c0b..438389f944b8e088354abf71a7cd64f126b7b8d6 100644 (file)
@@ -21,5 +21,4 @@ endif # PLATFORM_WINDOWS
 local-dist: $(icon) 
 xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)
-local-WWW: $(OUTPNG_FILES)
-
+local-WWW-1: $(OUTPNG_FILES)
index 7e2d2641d936b38afdf1f685d541f6588d7f532c..6fd3a7504fab40667f37e8eafc76f27e28c32752 100644 (file)
@@ -3,6 +3,7 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
+OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)
 HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html) $(TELY_FILES:%.tely=$(outdir)/%.html)
 PDF_FILES=$(outdir)/NEWS.pdf
 README_TOP_FILES=NEWS AUTHORS INSTALL README
@@ -12,5 +13,7 @@ include $(depth)/make/stepmake.make
 
 MAKEINFO_FLAGS += -I $(top-src-dir)/Documentation/user
 
+local-WWW-1: $(OUT_TEXI_FILES)
+
 .SECONDARY:
 
index eb4577dcc3dad493026e783bce15c736a495f10f..6d887f580e499dc6e34be78a94cfdf4a264eb7bb 100644 (file)
@@ -16,6 +16,10 @@ OUT_PNG_IMAGES=$(OUT_PDF_IMAGES:%.pdf=%.png)
 
 OUT_TEXI_FILES=$(ITEXI_FILES:%.itexi=$(outdir)/%.texi)\
  $(ITELY_FILES:%.itely=$(outdir)/%.texi)
+
+MASTER_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)\
+ $(outdir)/lilypond-internals.texi
+
 HTML_FILES = $(TELY_FILES:%.tely=$(outdir)/%-big-page.html)\
  $(outdir)/lilypond-internals-big-page.html
 
@@ -63,8 +67,6 @@ extra-local-help:
   xml        update Docbook xml documentation\n\
 "
 
-# Generic rule using % twice not possible?
-# $(outdir)/%/%.html: $(outdir)/%.texi
 $(outdir)/lilypond.texi: $(outdir)/lilypond-internals.texi
 
 #
@@ -123,8 +125,9 @@ $(outdir)/%/source:
        mkdir -p $(dir $@)
        ln -sf $(depth)/.. $(@)
 
-local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
- $(datafiles) $(PDF_FILES) $(source-links) info
+local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) info
+
+local-WWW-2: $(HTML_FILES) $(DEEP_HTML_FILES) $(source-links)
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@
@@ -146,9 +149,4 @@ $(outdir)/lilypond.texi $(outdir)/lilypond-program.texi $(outdir)/lilypond-learn
 $(outdir)/lilypond-internals.texi: $(LILYPOND_BINARY)
        cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/ly/generate-documentation
 
-
-## unused
-$(outdir)/interfaces.itexi: dummy
-       cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
-
 .SECONDARY:
index 6da515c15dcfea28f0acb83641ce100b54a124d2..ef3f12f25adba98690f815136e86a804d70fb84d 100644 (file)
@@ -82,7 +82,7 @@ final-install:
 # For both online and offline docs, issue `make web WEB_TARGETS="offline online"'
 WEB_TARGETS = offline
 
-local-WWW-post:
+WWW-post:
 # need UTF8 setting in case this is hosted on a website. 
        echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(top-build-dir)/.htaccess
        $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/
index eacbcb922006ffe6ff457aac10c26537383e5548..f91dacd38d76370acdd7c6f70adcbacb75f3ffbc 100644 (file)
@@ -56,8 +56,10 @@ local-uninstall-WWW: local-uninstall-info
 local-clean:
        rm -f $(INFO_IMAGES_DIR)
 
-local-WWW: info $(outdir)/lilypond-snippets.pdf \
-  $(outdir)/lilypond-snippets/index.html \
+local-WWW-1: info $(outdir)/lilypond-snippets.pdf \
+  $(outdir)/lilypond-snippets.texi
+
+local-WWW-2: $(outdir)/lilypond-snippets/index.html \
   $(outdir)/lilypond-snippets-big-page.html \
   $(source-links)
 
index 52e46843914817360ab988da8c239faa904bea30..62321a0d9fc0d274eb6a5d087c8a6b4a1d5e88a1 100644 (file)
@@ -7,7 +7,7 @@ $(outdir)/%-big-page.html: $(outdir)/%.texi $(OUT_PNG_IMAGES) $(outdir)/version.
        $(TEXI2HTML) --I=$(outdir) $(TEXI2HTML_FLAGS) --output=$@ $(TEXI2HTML_INIT) $<
        cp $(top-src-dir)/Documentation/lilypond*.css $(dir $@)
 
-$(outdir)/%.pdftexi: $(outdir)/%.texi doc-po $(outdir)/version.itexi
+$(outdir)/%.pdftexi: $(outdir)/%.texi $(outdir)/version.itexi
        $(PYTHON) $(buildscript-dir)/texi-gettext.py $(ISOLANG) $<
 
 $(outdir)/%.pdf: $(outdir)/%.pdftexi $(outdir)/version.itexi
@@ -23,10 +23,8 @@ $(outdir)/%.png: $(top-build-dir)/Documentation/user/$(outdir)/%.png
 
 # This makes sure lilypond-doc gettext domain has been compiled
 # before lilypond-book runs
-%.tely: doc-po
+$(TELY_FILES): doc-po
 
-$(OUT_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
-
-$(DEEP_HTML_FILES) $(PDF_FILES): $(ITELY_FILES) $(ITEXI_FILES)
+$(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES)
 
 .SECONDARY:
index 4fd4bad6948c430cfdc0a5f50813001b3db178a5..25cea3754863c7de68001d3811c72faa5eb5fd81 100644 (file)
@@ -1,10 +1,14 @@
 default:
 
+local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES)
+
 # BIG_PAGE_HTML_FILES is defined differently in each language makefile
-local-WWW: $(DEEP_HTML_FILES) $(PDF_FILES) doc-po $(BIG_PAGE_HTML_FILES)
+local-WWW-2: $(DEEP_HTML_FILES) $(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 out=www messages
+
+.PHONY: doc-po
index 0d4da0e81bd242b833acca4a959942cfd0131f10..9e34dac5ecbf1ecf694949089c3a0ffcb059665d 100644 (file)
@@ -20,10 +20,10 @@ TEXI2HTML = LANG= $(TEXI2HTML_PROGRAM)
 
 TEXI2PDF_FLAGS += --batch $(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)
+TELY_FILES := $(call src-wildcard,*.tely)
+MASTER_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)
index bc9e47b963da2713c0c238c20396a5e9c1c93c94..fe849db405729d138aae85bc6de929d523145dfc 100644 (file)
@@ -12,14 +12,11 @@ $(outdir)/%.latex:  %.doc
 # don't do ``cd $(outdir)'', and assume that $(outdir)/.. is the src dir.
 # it is not, for --srcdir builds
 $(outdir)/%.texi: %.tely $(outdir)/version.itexi
-       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir)  --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
+       $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
 
 
 $(outdir)/%.texi: $(outdir)/%.tely $(outdir)/version.itexi
        $(PYTHON) $(LILYPOND_BOOK) $(LILYPOND_BOOK_INCLUDES) --process='$(LILYPOND_BOOK_PROCESS) $(LILYPOND_BOOK_INCLUDES) $(LILYPOND_BOOK_LILYPOND_FLAGS)' --output=$(outdir) --format=$(LILYPOND_BOOK_FORMAT) $(LILYPOND_BOOK_FLAGS) $<
-#
-# DON'T REMOVE SOURCE FILES, otherwise the .TEXI ALWAYS OUT OF DATE.
-#      rm -f $<
 
 $(outdir)/%.html.omf: %.tely
        $(call GENERATE_OMF,html)
index b4655018836878f4b5b5e2945ecd2a650dd991fa..be960222b784b92c7b5a7fa382453bf562848be0 100644 (file)
@@ -1,4 +1,3 @@
-
 $(outdir)/collated-files.tely: $(LY_FILES) $(OUT_LY_FILES)
        $(PYTHON) $(buildscript-dir)/lys-to-tely.py --name=$(outdir)/collated-files.tely --title="$(TITLE)" $^
 
index c2d08b5fec312cd2ac4c3263b06fd197ca0dc0ea..0b5d6ec2ed493d57143ccedf53fa3d524772e7e5 100644 (file)
@@ -1,8 +1,6 @@
+local-WWW-1: $(outdir)/collated-files.texi $(outdir)/collated-files.pdf
 
-
-local-WWW: $(outdir)/collated-files.html $(outdir)/collated-files.pdf
-
-#.PRECIOUS: $(outdir)/$(NAME).texi
+local-WWW-2: $(outdir)/collated-files.html
 
 local-test-baseline:
        rm -rf $(outdir)-baseline
index e6532133637deee579e3bc14f8c3d6f54433bdd6..96d44b12f3855a5746be979e11b8330e08c5ea7d 100644 (file)
@@ -1,4 +1,2 @@
 TITLE=LYs Doc
 
-NAME=collated-files
-
index 4a12833a556621119315215f2bdd2ad783abdebb..deaf2408616932a5375971f2ae79596ba559d91d 100644 (file)
@@ -1,14 +1,12 @@
 .PHONY: download mutopia png ps scores tar
 
 .PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps
-.PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps
+.PRECIOUS: $(outdir)-letter/%.ps
 
 
 all: $(OUT_FILES)
 
-# we want dvi_examples as well, because they get thrown away otherwise
-# incurring another costly lilypond run.
-local-WWW: $(ly_examples) $(pdf_examples) $(png_examples)
+local-WWW-1: $(ly_examples) $(pdf_examples) $(png_examples)
 
 tar:
        mkdir -p $(outdir)/$(tarball)
@@ -24,7 +22,7 @@ scores: $(score_ps)
        $(MAKE) ps_examples="$<" ps
 
 local-mutopia:
-       $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW $(mutopia-letter)
+       $(MAKE) examples="$(mutopia-examples)" PAPERSIZE=letter local-WWW-1 $(mutopia-letter)
 
 mutopia: local-mutopia
        $(LOOP)
index 8bcb8223fc018a0bc08e07e5dfb67ccd338b1b12..0f63330a210764038c4b195bbdd52f56b7d396a9 100644 (file)
@@ -1,5 +1 @@
-# do we need this?
 default:
-
-local-WWW: $(OUTHTML_FILES)
-
index 28c4a46ca3d513c36f1c6896d3565f3c43a70040..ced5b7e3f7e76ee6b6b8b5d7a449dc0168a5f71c 100644 (file)
@@ -1,5 +1,6 @@
-.PHONY : all clean config default dist doc exe help html lib TAGS\
-        po
+.PHONY : all clean config default dist dist exe help html lib TAGS\
+        po web web-1 WWW-1 WWW-2 WWW-post local-WWW-1 local-WWW-2\
+        web-install
 
 all:    default
        $(LOOP)
@@ -158,21 +159,30 @@ $(config_make): $(top-src-dir)/configure
        touch $@                # do something for multiple simultaneous configs.
 
 
-################ website.
+#### Documentation (website and tarball)
 
-local-WWW:
-local-WWW-post:
+# documentation is built in two stages,
+# plus WWW-post (only at toplevel)
+# see INSTALL for more information.
+
+local-WWW-1:
+local-WWW-2:
 web-install:
+WWW-post:
 
-WWW: local-WWW
+WWW-1: local-WWW-1
        $(LOOP)
 
-WWW-post: local-WWW-post
+WWW-2: local-WWW-2
        $(LOOP)
 
 web:
-       $(MAKE) out=www WWW
+       $(MAKE) out=www WWW-1
+       $(MAKE) out=www WWW-2
        $(MAKE) out=www WWW-post
 
+web-1:
+       $(MAKE) out=www WWW-1
+
 web-clean:
        $(MAKE) out=www clean
index aeda6e617159333834802997d9642e688b4239a8..8b6669af21a28dcb24a68a297c5d4ee821656f5a 100644 (file)
@@ -2,7 +2,7 @@
 
 default: $(INFO_FILES)
 
-local-WWW: $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.html))
+local-WWW-2: $(addprefix $(outdir)/,$(TEXI_FILES:.texi=.html))
 
 local-doc: $(OUTTXT_FILES)
 
index 5c4777ec92f7382b0e88db531dc9eb27110ecb4a..93d2f9cccf3c3d6b05c22a52c0f41811630ff890 100644 (file)
@@ -1,6 +1,8 @@
 
 default: local-doc
 
-local-WWW: $(HTML_FILES) $(PDF_FILES)
+local-WWW-1: $(PDF_FILES)
+
+local-WWW-2: $(HTML_FILES)
 
 make-txt-files: $(TO_TOP_FILES)