Web: rename web/examples to web/ly-examples

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 52ae7e9799837c8a106705efdad956293d3548a1..5916e83bf3dc50b051a8e11f0230134459f5a10f 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) search-box.ihtml
 
 ### Out files
 
@@ -76,7 +76,7 @@ source-links = $(outdir)/source\
 HTML_PAGE_NAMES= translations index
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
-MAIN_INFO_DOC = lilypond-notation
+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
@@ -95,12 +95,7 @@ include $(depth)/make/stepmake.make
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
 ### Web site idiosyncrases
-
-$(outdir)/web/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(outdir)/web/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
-
-#$(outdir)/web/index.html:
-#      $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/web.texi
+$(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
 
 ### bad hack for badly-integrated roadmap.
@@ -173,11 +168,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
@@ -224,7 +219,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
@@ -254,7 +249,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,42 +274,44 @@ TRANSLATION_FILES = $(shell git ls-files $(ISOLANG) | grep -v GNUmakefile)
 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) --skeleton $(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 \
 -I $(top-src-dir)/Documentation/snippets \
--I $(top-build-dir)/Documentation/out-www
+-I $(top-build-dir)/Documentation/out-www \
+-I $(top-build-dir)/Documentation/out
 
 else # ISOLANG is empty
 
 DOCUMENTS_INCLUDES:=-I . \
 -I $(top-build-dir)/Documentation/out-www \
 -I $(top-src-dir)/Documentation/snippets \
--I $(top-build-dir)/Documentation/snippets/out-www
+-I $(top-build-dir)/Documentation/snippets/out-www \
+-I $(top-build-dir)/Documentation/out
 
 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
+       $(PYTHON) $(auxscript-dir)/translations-status.py
 
 .SECONDARY: