Docs: restore CSS files in directories that use lysdoc template

In particular, this fixes missing CSS for regressions tests.

Also move out CSS files prerequisite to WWW-2 in all directories that
use texinfo template.

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 15af53531a340d9a23a28bdc01760fa2655b351a..ab36a560a98730ae2623de4dfb3b5284155fa41b 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -139,8 +139,6 @@ txt-to-html:
        $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
 
 
-$(OUT_HTML_FILES): $(OUT_CSS_FILES)
-
 $(outdir)/%.css: %.css
        ln -f $< $@
 

diff --git a/make/lysdoc-rules.make b/make/lysdoc-rules.make
index 67458875144156866e71c8ccbc31121e529470c0..68c4aba79ef94dd3e77938360e63c27bfccf078d 100644 (file)
--- a/make/lysdoc-rules.make
+++ b/make/lysdoc-rules.make
@@ -1,3 +1,5 @@
 $(outdir)/collated-files.tely: $(COLLATED_FILES)
        $(LYS_TO_TELY) --name=$(outdir)/collated-files.tely --title="$(TITLE)" $^
 
+$(outdir)/%.css: $(top-src-dir)/Documentation/%.css
+       ln -f $< $@

diff --git a/make/lysdoc-vars.make b/make/lysdoc-vars.make
index a2874b271b80bb99b9fc56aa8e64cdcf71a21c96..116da06f4190c7dae84dd0ee5bf598224e3d0a57 100644 (file)
--- a/make/lysdoc-vars.make
+++ b/make/lysdoc-vars.make
@@ -4,3 +4,6 @@ TITLE=LYs Doc
 ifeq ($(COLLATED_FILES),)
 COLLATED_FILES = $(sort $(TEXINFO_SOURCES) $(LY_FILES) $(OUT_LY_FILES) )
 endif
+
+CSS_FILES = $(shell ls $(top-src-dir)/Documentation/lilypond*.css)
+OUT_CSS_FILES = $(foreach f, $(CSS_FILES), $(outdir)/$(notdir $(f)))

diff --git a/stepmake/stepmake/texinfo-targets.make b/stepmake/stepmake/texinfo-targets.make
index ede79d46e1dad4f116fff8efccef1f4b2ce4709b..edad43017fae9fdd7756e640cc69e2787d0c5fa2 100644 (file)
--- a/stepmake/stepmake/texinfo-targets.make
+++ b/stepmake/stepmake/texinfo-targets.make
@@ -4,6 +4,8 @@ default: $(INFO_FILES)
 
 ifeq ($(out),www)
 local-WWW-1: $(XREF_MAPS_FILES)
+
+local-WWW-2: $(OUT_CSS_FILES)
 endif
 
 local-doc:  $(OUTTXT_FILES)