X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2FGNUmakefile;h=5f04dc880cf1297f4f37d1297e2ff161344313a5;hb=9cf5411d1e02cb316662b73b8fb483062ec6e754;hp=19ae57769883b1d8f3667373d426ed2c1bc98544;hpb=f3b3c671b744a9b8be0ad969c38b563fd20ebee1;p=lilypond.git

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 19ae577698..5f04dc880c 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -12,7 +12,7 @@ LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 MANUALS_SUBDIRS = usage contributor essay \
   web learning notation extending
 SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \
-  included $(LANGS)
+  included ly-examples $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
 LOCALSTEPMAKE_TEMPLATES = lilypond ly
 
@@ -23,7 +23,7 @@ TEXI2PDF_FLAGS = \
   -I $(outdir) \
   -I $(top-build-dir)/Documentation/$(outconfbase)
 $(outdir)/snippets-big-page.html: TEXI2HTML_FLAGS += -D short_toc
-$(outdir)/snippets/index..html: TEXI2HTML_FLAGS += -D short_toc
+$(outdir)/snippets/index.html: TEXI2HTML_FLAGS += -D short_toc
 
 ### Extra source files
 
@@ -57,19 +57,19 @@ TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
 PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
 TOPDIR_HTML_MANUALS =
-UNSPLITTED_HTML_MANUALS =
-SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
- $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
-NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLITTED_HTML_MANUALS),\
+UNSPLIT_HTML_MANUALS =
+SPLIT_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
+ $(if $(findstring $(manual), $(UNSPLIT_HTML_MANUALS)),,$(manual)))
+NOT_TOPDIR_HTML_MANUALS = $(foreach manual, $(SPLIT_HTML_MANUALS),\
  $(if $(findstring $(manual), $(TOPDIR_HTML_MANUALS)),,$(manual)))
 
-OUT_HTML_FILES = $(UNSPLITTED_HTML_MANUALS:%=$(outdir)/%.html)\
- $(SPLITTED_HTML_MANUALS:%=$(outdir)/%-big-page.html)
+OUT_HTML_FILES = $(UNSPLIT_HTML_MANUALS:%=$(outdir)/%.html)\
+ $(SPLIT_HTML_MANUALS:%=$(outdir)/%-big-page.html)
 DEEP_HTML_FILES = $(NOT_TOPDIR_HTML_MANUALS:%=$(outdir)/%/index.html)
 
 # Symlinks to refer to external source documents from split and non-split HTML
 source-links = $(outdir)/source\
- $(foreach manual, $(SPLITTED_HTML_MANUALS), $(outdir)/$(manual)/source)
+ $(foreach manual, $(SPLIT_HTML_MANUALS), $(outdir)/$(manual)/source)
 
 # Other out files
 
@@ -134,18 +134,6 @@ $(outdir)/essay.texi: \
   $(outdir)/computer-notation.itexi \
   $(outdir)/engravingbib.itexi
 
-$(outdir)/others-did.itexi:
-	BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
-		-s $(top-src-dir)/Documentation/lily-bib \
-		-o $(outdir)/others-did.itexi \
-		$(src-dir)/web/others-did.bib
-
-$(outdir)/we-wrote.itexi:
-	BSTINPUTS=$(src-dir)/web/ $(buildscript-dir)/bib2texi \
-		-s $(top-src-dir)/Documentation/lily-bib \
-		-o $(outdir)/we-wrote.itexi \
-		$(src-dir)/web/we-wrote.bib
-
 
 ###########
 ### Targets
@@ -207,12 +195,18 @@ endif
 ### Rules
 
 $(outdir)/lilypond-%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi $(outdir)/weblinks.itexi
-	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<
+	$(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$@ $<"  "$*.makeinfo.log"
+
+txt-to-html: $(OUT_TXT_FILES) $(OUT_TXT_FILES:%.txt=%.html)
 
-# cd $(outdir) rule gets bit hairy for --srcdir configure builds
-txt-to-html:
-	$(foreach a, $(README_TOP_FILES), cp $(top-src-dir)/$(a) $(outdir)/$(a).txt && ) true
-	$(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
+$(OUT_TXT_FILES): $(outdir)/%.txt: $(top-src-dir)/%
+	cp -f $< $@
+
+$(OUT_TXT_FILES:%.txt=%.html): $(outdir)/%.html: $(outdir)/%.txt
+	$(PYTHON) $(step-bindir)/text2html.py $<
+
+# Explicitly list the dependencies on generated content
+$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi $(outdir)/weblinks.itexi
 
 ifeq ($(out),www)
 ## Extra images dependencies
@@ -222,35 +216,29 @@ $(outdir)/pictures:
 	$(MAKE) -C pictures WWW-1
 	ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/ly-examples:
-	$(MAKE) -C web/ly-examples
-	ln -sf ../web/ly-examples/$(outdir) $@
-endif
+$(outdir)/web.texi: $(outdir)/css $(outdir)/ly-examples
 
-ifeq ($(out),www)
-$(outdir)/web.texi: $(outdir)/ly-examples $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
-else
-# duplicate (without ly-examples)
-$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
+$(outdir)/css:
+	$(MAKE) -C css
+	ln -sf ../css/$(outdir) $@
+
+$(outdir)/ly-examples:
+	$(MAKE) -C ly-examples
+	ln -sf ../ly-examples/$(outdir) $@
 endif
 
 
 # Ugh, using '%' twice not possible
 $(outdir)/notation/notation.xml: $(outdir)/notation.texi
 	mkdir -p $(dir $@)
-	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<
+	$(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<"  "$*.makeinfoxml.log"
 
 $(outdir)/internals/internals.xml: $(outdir)/internals.texi
 	mkdir -p $(dir $@)
-	$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<
+	$(buildscript-dir)/run-and-check "$(MAKEINFO) -I$(src-dir) -I$(outdir) --output=$(dir $@) --docbook $<"  "$*.makeinfoxml.log"
 
 $(outdir)/learning.texi $(outdir)/notation.texi: $(OUT_PDF_IMAGES)
 
-$(foreach manual, $(MANUAL_SUBDIRS),\
-$(eval $(outdir)/(manual).texi: $(call src-wildcard,$(manual)/*.ite??)))
-
-
-
 $(outdir)/source:
 	@rm -f $(@)
 	ln -sf $(depth) $(@)
@@ -383,5 +371,3 @@ update-translation:
 # what's it gonna be, boy...tranlationS-/translation-
 translation-status:
 	PYTHONPATH=$(top-src-dir)/python:$(top-src-dir)/python/auxiliar $(PYTHON) $(top-src-dir)/scripts/auxiliar/translations-status.py
-
-.SECONDARY: