Doc build: move general.texi back into a subdir.

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index d748db860a871c11cf455940528f329c1945a1cf..f91b178e8fda8664f50cf738e9703557c0b851a6 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -9,8 +9,10 @@ depth = ..
 
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
-MANUALS_SUBDIRS = usage automated-engraving contributor essay general learning notation
-SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs $(LANGS)
+MANUALS_SUBDIRS = usage automated-engraving contributor essay \
+  general learning notation extending
+SUBDIRS = $(MANUALS_SUBDIRS) snippets logo pictures misc po css topdocs \
+  included $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
 LOCALSTEPMAKE_TEMPLATES = lilypond ly
 
@@ -54,13 +56,16 @@ TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
 
 PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
-UNSPLITTED_HTML_MANUALS = changes
+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),\
+ $(if $(findstring $(manual), $(TOPDIR_HTML_MANUALS)),,$(manual)))
 
 OUT_HTML_FILES = $(UNSPLITTED_HTML_MANUALS:%=$(outdir)/%.html)\
  $(SPLITTED_HTML_MANUALS:%=$(outdir)/%-big-page.html)
-DEEP_HTML_FILES = $(SPLITTED_HTML_MANUALS:%=$(outdir)/%/index.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\
@@ -68,13 +73,13 @@ source-links = $(outdir)/source\
 
 # Other out files
 
-HTML_PAGE_NAMES= translations
+HTML_PAGE_NAMES= translations index
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 
 MAIN_INFO_DOC = lilypond-notation
 INFO_DOCS = lilypond-usage lilypond-changes lilypond-contributor lilypond-internals \
  lilypond-essay lilypond-learning lilypond-notation music-glossary \
- lilypond-general
+ lilypond-general lilypond-extending
 ifeq ($(out),www)
 INFO_DOCS += lilypond-snippets 
 endif
@@ -94,9 +99,8 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 $(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
 $(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
 
-OUT_HTML_FILES += $(outdir)/index.html
-$(outdir)/index.html: $(outdir)/general/index.html
-       mv $(outdir)/general/* $(outdir)/
+#$(outdir)/general/index.html:
+#      $(TEXI2HTML) $(TEXI2HTML_SPLIT) $(TEXI2HTML_FLAGS) --output $(outdir)/ $(outdir)/general.texi
 
 ###########
 ### Targets
@@ -114,6 +118,7 @@ extra-local-help:
 \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\
@@ -249,30 +254,20 @@ new-lang-dir:
        rm -f $(outdir)/$(DIR).tely $(outdir)/$(DIR).texi
        for i in $$(cd $(outdir) && ls -1 *.*tely *.*texi); do\
            test -e $(ISOLANG)/$(DIR)/$$i\
+               || test -e $(ISOLANG)/$$i\
                || mv $(outdir)/$$i $(ISOLANG)/$(DIR)/$$i;\
        done
 
 new-lang:
 # Also for updating/adding missing files
+       mkdir -p $(ISOLANG)
        $(foreach i,$(TRANSLATION_DIRS),$(MAKE) new-lang-dir DIR=$(i) &&) :
-       $(foreach i, $(EXTRA_TRANSLATION_FILES), \
-           (test -e $(ISOLANG)/$(i) \
-               || cp fr/$(i) $(ISOLANG)/$(i)) && ) true
        msgmerge -U po/lilypond-doc.pot $(outdir)/doc.pot
        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 = $(shell git ls-files $(ISOLANG) | $(PYTHON) $(buildscript-dir)/pytt.py '/[^/]*$$' / | sort -u )
-TRANSLATION_DIRS = general learning notation texidocs usage
+TRANSLATION_DIRS = general texidocs
 TRANSLATION_FILES = $(shell git ls-files $(ISOLANG) | grep -v GNUmakefile)
-EXTRA_TRANSLATION_FILES =\
- dedication.itely\
- common-macros.itexi\
- macros.itexi\
- translations.html.in\
- translations.template.html.in\
-#
-
 
 TELY_FILES = $(call src-wildcard,$(ISOLANG)/*.tely)
 skeleton-update: