Web build: revert overly-ambitious deletion.

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index f91b178e8fda8664f50cf738e9703557c0b851a6..24bd9663cb7d75b4dad47f76356e5d6307e099e9 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -10,7 +10,7 @@ depth = ..
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 MANUALS_SUBDIRS = usage automated-engraving contributor essay \
-  general learning notation extending
+  web learning notation extending
 SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \
   included $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
@@ -76,10 +76,10 @@ 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-general lilypond-extending
+ lilypond-web lilypond-extending
 ifeq ($(out),www)
 INFO_DOCS += lilypond-snippets 
 endif
@@ -95,12 +95,14 @@ include $(depth)/make/stepmake.make
 OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 
 ### Web site idiosyncrases
+$(XREF_MAPS_DIR)/web.xref-map: XREF_MAP_FLAGS += --split=node
 
-$(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
 
-#$(outdir)/general/index.html:
-#      $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/general.texi
+### bad hack for badly-integrated roadmap.
+$(outdir)/ROADMAP:
+       cp $(top-src-dir)/ROADMAP $(outdir)
+$(outdir)/contributor.texi: $(outdir)/ROADMAP
+
 
 ###########
 ### Targets
@@ -166,11 +168,11 @@ $(outdir)/pictures:
        $(MAKE) -C pictures WWW-1
        ln -sf ../pictures/$(outdir) $@
 
-$(outdir)/general.texi: $(outdir)/examples
+$(outdir)/web.texi: $(outdir)/examples
 
 $(outdir)/examples:
-       $(MAKE) -C general/examples
-       ln -sf ../general/examples/$(outdir) $@
+       $(MAKE) -C web/examples
+       ln -sf ../web/examples/$(outdir) $@
 endif
 
 # Ugh, using '%' twice not possible
@@ -266,7 +268,7 @@ new-lang:
        test -e po/$(ISOLANG).po || cp po/lilypond-doc.pot po/$(ISOLANG).po
        @echo "***  Please add a language definition for $(ISOLANG) in python/langdefs.py  ***"
 
-TRANSLATION_DIRS = general texidocs
+TRANSLATION_DIRS = web texidocs
 TRANSLATION_FILES = $(shell git ls-files $(ISOLANG) | grep -v GNUmakefile)
 
 TELY_FILES = $(call src-wildcard,$(ISOLANG)/*.tely)
@@ -281,14 +283,16 @@ snippet-update:
 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