Doc-de: updates from master to NR

[lilypond.git] / Documentation / GNUmakefile

diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index e7e7f08e7953131cbc5c1085bb91bfc2ec856adc..0384e4c64a3687aabd3aab90eb13cf655d8ce543 100644 (file)
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -53,7 +53,7 @@ OUT_TEXINFO_MANUALS = $(TEXINFO_MANUALS:%=$(outdir)/%.texi)
 # of the NR
 TEXI_FILES_FROM_TELY = $(outdir)/internals.texi
 
-PDF_FILES = $(subst $(outdir)/general.pdf,,$(TEXINFO_MANUALS:%=$(outdir)/%.pdf))
+PDF_FILES = $(TEXINFO_MANUALS:%=$(outdir)/%.pdf)
 
 UNSPLITTED_HTML_MANUALS = changes
 SPLITTED_HTML_MANUALS = $(foreach manual, $(TEXINFO_MANUALS),\
@@ -93,12 +93,12 @@ OUT_TXT_FILES = $(addprefix $(outdir)/, $(addsuffix .txt, $(README_TOP_FILES)))
 ## No big page
 OUT_HTML_FILES := $(subst $(outdir)/general-big-page.html,,$(OUT_HTML_FILES))
 
+$(outdir)/essay/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT) -D=shallow_toc
+$(outdir)/essay/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
+
 $(outdir)/general/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
 $(outdir)/general/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
 
-$(outdir)/automated-engraving/index.html: TEXI2HTML_INIT = $(WEB_TEXI2HTML_INIT)
-$(outdir)/automated-engraving/index.html: TEXI2HTML_SPLIT = $(WEB_TEXI2HTML_SPLIT)
-
 ###########
 ### Targets
 
@@ -164,6 +164,14 @@ $(OUT_TEXINFO_MANUALS): $(outdir)/pictures
 $(outdir)/pictures:
        $(MAKE) -C pictures WWW-1
        ln -sf ../pictures/$(outdir) $@
+
+$(outdir)/general.texi: $(outdir)/examples
+
+$(outdir)/examples:
+       $(MAKE) -C general/examples
+# FIXME: who is replacing src="examples --> src="../examples" ?
+# [ugh, why do most scripts not even say they run anymore?]
+       ln -sf general/examples $@
 endif
 
 # Ugh, using '%' twice not possible