Build: Fix Documentation/css, ly-examples, pictures, topdocs.

Part of issue 3562: Build everything on first pass of make doc
http://code.google.com/p/lilypond/issues/detail?id=3562

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 44d4d04b02fe8a374f3a140a9addfe41aa585ac7..407bce61914b5d3f510e52c7cde35b913f04aeee 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -212,17 +212,17 @@ ifeq ($(out),www)
 $(OUT_TEXINFO_MANUALS): $(outdir)/pictures
 
 $(outdir)/pictures:
-       $(MAKE) -C pictures WWW-1
+       $(MAKE) -C pictures out=www WWW-1
        ln -sf ../pictures/$(outdir) $@
 
 $(outdir)/web.texi: $(outdir)/css $(outdir)/ly-examples
 
 $(outdir)/css:
-       $(MAKE) -C css
+       $(MAKE) -C css out=www WWW-1
        ln -sf ../css/$(outdir) $@
 
 $(outdir)/ly-examples:
-       $(MAKE) -C ly-examples
+       $(MAKE) -C ly-examples out=www WWW-1
        ln -sf ../ly-examples/$(outdir) $@
 endif
 

diff --git a/Documentation/ly-examples/GNUmakefile b/Documentation/ly-examples/GNUmakefile
index ad1c84ae49d5a7df0d857c50e3282b99bf5d0b86..c5c800b6e4a205b67ce8fc25164ce00ff4bc03bf 100644 (file)
--- a/Documentation/ly-examples/GNUmakefile
+++ b/Documentation/ly-examples/GNUmakefile
@@ -10,7 +10,7 @@ OUT_PNG_PAGES = $(PNG_PAGES:%=$(outdir)/%.png)
 OUT_SMALL_PNG_FILES = $(OUT_PNG_FILES:%.png=%-small.png)
 
 ifeq ($(out),www)
-all: $(OUT_PNG_FILES) $(OUT_SMALL_PNG_FILES)
+local-WWW-1: $(OUT_PNG_FILES) $(OUT_SMALL_PNG_FILES)
 endif
 
 $(outdir)/%.png: %.ly

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index ce3dc1f42beec03241cb71d546e8b2f99dd37385..3dd3ef3c8bebbb94b00adda1708c73ba9ee14bf2 100644 (file)
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -2,7 +2,7 @@ depth = ../..
 
 STEPMAKE_TEMPLATES=documentation tex texinfo topdocs
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-OUT_TEXI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.texi)
+OUT_TEXI_FILES = $(TEXI_FILES:%.texi=$(outdir)/%.texi) $(TELY_FILES:%.tely=$(outdir)/%.texi)
 HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html) $(TELY_FILES:%.tely=$(outdir)/%.html)
 README_TOP_FILES=NEWS AUTHORS INSTALL README
 OUTTXT_FILES= $(outdir)/NEWS.txt

diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index a8e7ab5edef58af094481bc22cf685056b893d43..43a2b78278ad455834588bb5f2eab5a3d82a5213 100644 (file)
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -32,7 +32,7 @@ $(outdir)/%.png: $(top-build-dir)/Documentation/$(outdir)/%.png
 $(MASTER_TEXI_FILES): $(ITELY_FILES) $(ITEXI_FILES) $(outdir)/pictures
 
 $(outdir)/pictures:
-       $(MAKE) -C $(top-build-dir)/Documentation/pictures WWW-1
+       $(MAKE) -C $(top-build-dir)/Documentation/pictures out=www WWW-1
        ln -sf $(top-build-dir)/Documentation/pictures/$(outdir) $@
 
 $(TRANSLATION_LILY_IMAGES): $(MASTER_TEXI_FILES)