]> git.donarmstrong.com Git - lilypond.git/blobdiff - Documentation/GNUmakefile
projects / lilypond.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Cleanup: sort header order, use explicit std:: prefix rather than
[lilypond.git] / Documentation / GNUmakefile
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 7fdb79671f58b64ee91db17b7befab764e238348..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.html
+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)))
@@ -73,15 +73,12 @@ source-links = $(outdir)/source\
 
 # Other out files
 
-HTML_PAGE_NAMES= translations index
-OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
-
 MAIN_INFO_DOC = lilypond-web
 INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
  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)
 
@@ -97,21 +94,32 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 ### Web site idiosyncrases
 $(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
-ifeq ($(out),www)
-website: $(outdir)/web.texi
-       mkdir -p $(outdir)/upload/
-       $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) -D web_version \
-               --output=$(outdir)/upload/ $(outdir)/web.texi
-       cp $(top-src-dir)/Documentation/css/*.css $(outdir)/upload/
-       #cd out-website && ln -sf ../$(outdir)/pictures pictures
-endif
-
 
 ### bad hack for badly-integrated roadmap.
 $(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
@@ -121,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)
@@ -161,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
@@ -177,11 +192,11 @@ $(outdir)/pictures:
        $(MAKE) -C pictures WWW-1
        ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/web.texi: $(outdir)/examples
+$(outdir)/web.texi: $(outdir)/ly-examples
 
-$(outdir)/examples:
-       $(MAKE) -C web/examples
-       ln -sf ../web/examples/$(outdir) $@
+$(outdir)/ly-examples:
+       $(MAKE) -C web/ly-examples
+       ln -sf ../web/ly-examples/$(outdir) $@
 endif
 
 # Ugh, using '%' twice not possible
@@ -228,7 +243,7 @@ $(outdir)/notation.texi: $(outdir)/ly-grammar.txt
 ## Rules for the automatically generated documentation
 $(outdir)/ly-grammar.txt: $(top-src-dir)/lily/parser.yy
        cd $(outdir) && $(BISON) -v $<
-       $(auxscript-dir)/yyout2grammar.py $(outdir)/parser.output $@
+       $(buildscript-dir)/yyout2grammar $(outdir)/parser.output $@
 
 # There used to be a dependency on a dummy target, to force a rebuild
 # of internals every time.  however, this triggers
@@ -258,7 +273,7 @@ new-lang-dir:
        cp fr/$(DIR)/GNUmakefile $(ISOLANG)/$(DIR)
        sed -i -e 's/ISOLANG *= *fr/ISOLANG = $(ISOLANG)/' $(ISOLANG)/GNUmakefile $(ISOLANG)/$(DIR)/GNUmakefile
        rm -f $(outdir)/*.*tely $(outdir)/*.*texi
-       $(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) -o doc.pot --skeleton --gettext $$(cd $(ISOLANG) && ls -1 ../$(DIR).tely ../$(DIR).texi)
+       $(PYTHON) $(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) -o doc.pot --skeleton --gettext $$(cd $(ISOLANG) && ls -1 ../$(DIR).tely ../$(DIR).texi)
        for i in $$(cd $(outdir) && ls -1 $(DIR).tely $(DIR).texi); do\
            test -e $(ISOLANG)/$$i || mv $(outdir)/$$i $(ISOLANG)/$$i;\
        done
@@ -279,15 +294,16 @@ 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)
-       $(auxscript-dir)/texi-langutils.py -d $(outdir) -l $(ISOLANG) --skeleton $(TELY_FILES:$(ISOLANG)/%.tely=../%.tely)
-       $(auxscript-dir)/texi-skeleton-update.py $(ISOLANG) $(outdir)
+       $(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:
-       $(auxscript-dir)/update-snippets.py user $(ISOLANG) '*.itely'
+       $(PYTHON) $(auxscript-dir)/update-snippets.py user $(ISOLANG) '*.itely'
 
 DOCUMENTS_INCLUDES:=-I $(ISOLANG) \
 -I $(top-build-dir)/Documentation/$(ISOLANG)/out-www \
@@ -306,21 +322,20 @@ DOCUMENTS_INCLUDES:=-I . \
 endif # ISOLANG
 
 check-xrefs:
-       $(auxscript-dir)/check_texi_refs.py --batch \
+       $(PYTHON) $(auxscript-dir)/check_texi_refs.py --batch \
        $(DOCUMENTS_INCLUDES) $(auxpython-dir)/manuals_definitions.py
 
 fix-xrefs:
-       $(auxscript-dir)/check_texi_refs.py --auto-fix \
+       $(PYTHON) $(auxscript-dir)/check_texi_refs.py --auto-fix \
        $(DOCUMENTS_INCLUDES) $(auxpython-dir)/manuals_definitions.py
 
 check-translation:
-       ISOLANG=$(ISOLANG) $(auxscript-dir)/check_translation.py $(CHECK_TRANSLATION_FLAGS) $(TRANSLATION_FILES)
+       ISOLANG=$(ISOLANG) $(PYTHON) $(auxscript-dir)/check_translation.py $(CHECK_TRANSLATION_FLAGS) $(TRANSLATION_FILES)
 
 update-translation:
-       ISOLANG=$(ISOLANG) $(auxscript-dir)/check_translation.py --update $(CHECK_TRANSLATION_FLAGS) $(TRANSLATION_FILES)
+       ISOLANG=$(ISOLANG) $(PYTHON) $(auxscript-dir)/check_translation.py --update $(CHECK_TRANSLATION_FLAGS) $(TRANSLATION_FILES)
 
 translation-status:
-       make -C po out=www messages
-       $(auxscript-dir)/translations-status.py
+       @echo Target temporarily disabled
 
 .SECONDARY:
Debian packaging of lilypond