Cleanup: sort header order, use explicit std:: prefix rather than

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 872166ad93c3092403707916b0d2c40582ad1349..d2a4eb2f58345f5ccb5c9cf1bb0eb6750079a998 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -32,7 +32,7 @@ README_TOP_FILES= DEDICATION THANKS
 IN_ITELY_FILES = $(call src-wildcard,snippets/*-intro.itely)
 SNIPPET_LY_FILES = $(call src-wildcard,snippets/*.ly)
 
-EXTRA_DIST_FILES = $(call src-wildcard,*.init) search-box.ihtml
+EXTRA_DIST_FILES = $(call src-wildcard,*.init)
 
 ### Out files
 
@@ -56,7 +56,7 @@ TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
 
 PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
-TOPDIR_HTML_MANUALS = 
+TOPDIR_HTML_MANUALS =
 UNSPLITTED_HTML_MANUALS =
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
  $(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),,$(manual)))
@@ -78,7 +78,7 @@ INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-intern
  lilypond-essay lilypond-learning lilypond-notation music-glossary \
  lilypond-web lilypond-extending
 ifeq ($(out),www)
-INFO_DOCS += lilypond-snippets 
+INFO_DOCS += lilypond-snippets
 endif
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
@@ -100,6 +100,26 @@ $(outdir)/ROADMAP:
        cp $(top-src-dir)/ROADMAP $(outdir)
 $(outdir)/contributor.texi: $(outdir)/ROADMAP
 
+### bad hack for badly-integrated bibliography
+$(outdir)/engravingbib.itexi:
+       BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
+               -o $(outdir)/colorado.html \
+               $(src-dir)/essay/colorado.bib
+       $(buildscript-dir)/html-to-texi \
+               < $(outdir)/colorado.html > $(outdir)/colorado.itexi
+       BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
+               -o $(outdir)/computer-notation.html \
+               $(src-dir)/essay/computer-notation.bib
+       $(buildscript-dir)/html-to-texi \
+               < $(outdir)/computer-notation.html > $(outdir)/computer-notation.itexi
+       BSTINPUTS=$(src-dir)/essay $(buildscript-dir)/bib2html \
+               -o $(outdir)/engravingbib.html \
+               $(src-dir)/essay/engravingbib.bib
+       $(buildscript-dir)/html-to-texi \
+               < $(outdir)/engravingbib.html > $(outdir)/engravingbib.itexi
+
+$(outdir)/essay.texi: $(outdir)/engravingbib.itexi
+
 
 ###########
 ### Targets
@@ -109,23 +129,30 @@ default: local-txt-doc
 local-help: extra-local-help
 
 extra-local-help:
-       @echo -e "\
-  check-xrefs [ISOLANG=LL] validate Texinfo cross-references\n\
-  fix-xrefs [ISOLANG=LL]   interactively fix Texinfo cross-references (use with caution)\n\
-  info        update info pages\n\
-  xml        update Docbook xml documentation\n\
-\n\
-Translations specific targets (see TRANSLATION for details):\n\
-  new-lang ISOLANG=LL  create and initialize subdirectory \'LL' for language \'LL\n\
-(if \'LL exists, update missing file)\n\
-  po-update            update and replace PO files for documentation with msgmerged versions\n\
-  check-translation ISOLANG=LL   show changes in English docs since last translation update\n\
-  update-translation ISOLANG=LL  call $$$$EDITOR to help updating the translation\n\
-  skeleton-update ISOLANG=LL     update Texinfo skeleton files\n\
-  snippet-update ISOLANG=LL      update ly snippets in Texinfo translation according to\n\
-                              docs in English (use with caution)\n\
-\n\
-LL refers to the desired locale (most often only the ISO 639 language code).\n"
+       @echo "  check-xrefs [ISOLANG=LL] validate Texinfo cross-references"
+       @echo "  fix-xrefs [ISOLANG=LL]   interactively fix Texinfo cross-references"
+       @echo "                             (use with caution)"
+       @echo "  info                     update info pages"
+       @echo "  xml                      update Docbook xml documentation"
+       @echo
+       @echo "Translations specific targets (see TRANSLATION for details):"
+       @echo "  new-lang ISOLANG=LL           create and initialize"
+       @echo "                                  subdirectory \'LL' for language \'LL"
+       @echo "                                  (if \'LL exists, update missing file)"
+       @echo "  po-update                     update and replace PO files for"
+       @echo "                                  documentation with msgmerged versions"
+       @echo "  check-translation ISOLANG=LL  show changes in English docs since"
+       @echo "                                  last translation update"
+       @echo "  update-translation ISOLANG=LL call $$$$EDITOR to help updating"
+       @echo "                                  the translation"
+       @echo "  skeleton-update ISOLANG=LL    update Texinfo skeleton files"
+       @echo "  snippet-update ISOLANG=LL     update ly snippets in Texinfo translation"
+       @echo "                                  according to docs in English"
+       @echo "                                  (use with caution)"
+       @echo
+       @echo "  LL refers to the desired locale"
+       @echo "    (most often only the ISO 639 language code)."
+       @echo
 
 info: $(INFO_FILES)
        @echo export LILYPOND_DATADIR=$(LILYPOND_DATADIR)
@@ -149,7 +176,7 @@ endif
 #########
 ### Rules
 
-$(outdir)/lilypond-%.info: $(outdir)/%.texi $(outdir)/$(INFO_IMAGES_DIR).info-images-dir-dep $(outdir)/version.itexi
+$(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=$@ $<
 
 # cd $(outdir) rule gets bit hairy for --srcdir configure builds
@@ -267,11 +294,12 @@ new-lang:
 
 TRANSLATION_DIRS = web texidocs
 TRANSLATION_FILES = $(shell git ls-files $(ISOLANG) | grep -v GNUmakefile)
+TEXI_LANGUTIL_FLAGS += --skeleton
 
 TELY_FILES = $(call src-wildcard,$(ISOLANG)/*.tely)
 skeleton-update:
        mkdir -p $(ISOLANG)
-       $(PYTHON) $(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) --skeleton $(TELY_FILES:$(ISOLANG)/%.tely=../%.tely)
+       $(PYTHON) $(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) $(TEXI_LANGUTIL_FLAGS) $(TELY_FILES:$(ISOLANG)/%.tely=../%.tely)
        $(PYTHON) $(auxscript-dir)/texi-skeleton-update.py $(ISOLANG) $(outdir)
 
 snippet-update: