Docs: rename Documentation/pictures/ to Documentation/logo/

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index f3eeb87350585c10f0c4a536df987c567963dc22..07a93c3bcb7f75f6a4c91988b9d289ee096f0d45 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -9,8 +9,8 @@ depth = ..
 
 NAME = documentation
 LANGS = $(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
-MANUALS_SUBDIRS = application contributor learning notation
-SUBDIRS = $(MANUALS_SUBDIRS) snippets bibliography pictures misc po $(LANGS)
+MANUALS_SUBDIRS = application contributor essay learning notation
+SUBDIRS = $(MANUALS_SUBDIRS) snippets bibliography logo pictures misc po $(LANGS)
 STEPMAKE_TEMPLATES = documentation texinfo tex omf
 LOCALSTEPMAKE_TEMPLATES = lilypond ly
 
@@ -50,24 +50,35 @@ TEXINFO_MANUALS = internals\
  $(TELY_FILES:%.tely=%)\
  $(TEXI_FILES:%.texi=%)
 
+## CHAIN_RULE hack: keep the following line *before* including
+# stepmake.make, so the Internals Reference is built before the
+# Notation Reference, thus providing automatically generated sections
+# of the NR
+TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
+
 PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
 UNSPLITTED_HTML_MANUALS = changes
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
-$(if $(findstring $(manual), $(UNSPLITTED_HTML_MANUALS)),, $(manual)))
+ $(if $(findstring $(manual), $(UNSPLITTED_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)
 
+# Symlinks to refer to external source documents from split and non-split HTML
+source-links = $(outdir)/source\
+ $(foreach manual, $(SPLITTED_HTML_MANUALS), $(outdir)/$(manual)/source)
+
 # Other out files
+
 HTML_PAGE_NAMES= index translations devel
 OUT_HTML_FILES += $(HTML_PAGE_NAMES:%=$(outdir)/%.html)
 OUT_CSS_FILES = $(CSS_FILES:%.css=$(outdir)/%.css)
 
 MAIN_INFO_DOC = lilypond-notation
 INFO_DOCS = lilypond-application lilypond-changes lilypond-contributor lilypond-internals \
- lilypond-learning lilypond-notation music-glossary
+ lilypond-essay lilypond-learning lilypond-notation music-glossary
 ifeq ($(out),www)
 INFO_DOCS += lilypond-snippets 
 endif
@@ -85,7 +96,7 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 ###########
 ### Targets
 
-default: local-doc
+default: local-txt-doc
 
 local-help: extra-local-help
 
@@ -135,8 +146,6 @@ txt-to-html:
        $(PYTHON) $(step-bindir)/text2html.py $(OUT_TXT_FILES)
 
 
-$(OUT_HTML_FILES): $(OUT_CSS_FILES)
-
 $(outdir)/%.css: %.css
        ln -f $< $@
 
@@ -173,11 +182,6 @@ $(outdir)/%.pdf: %.eps
        gs -dAutoRotatePages=/None -sDEVICE=pdfwrite -dNOPAUSE -dBATCH -sOutputFile=$@ -dEPSCrop -c .setpdfwrite -f $<
 
 
-# Symlinks to refer to external source documents from split and non-split HTML
-source-links = $(outdir)/source $(outdir)/notation/source $(outdir)/music-glossary/source \
- $(outdir)/application/source $(outdir)/learning/source $(outdir)/internals/source \
- $(outdir)/snippets/source
-
 $(outdir)/source:
        @rm -f $(@)
        ln -sf $(depth) $(@)