From: John Mandereau Date: Mon, 27 Jul 2009 23:19:42 +0000 (+0200) Subject: Docs: restore CSS files in directories that use lysdoc template X-Git-Tag: release/2.13.4-1~269 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eac3f74f989cd33ba046ade1edf1e6853eef4bde;p=lilypond.git 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 15af53531a..ab36a560a9 100644 --- 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 6745887514..68c4aba79e 100644 --- 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 a2874b271b..116da06f41 100644 --- 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 ede79d46e1..edad43017f 100644 --- 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)