* Merge from stable:

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 245127e48d4de0b509a5aa59b8de3fd028d42181..08a901afd7856cd91177c64d9311a320414744c3 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -13,18 +13,16 @@ EXTRA_DIST_FILES= $(LATEX_FILES)
 HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))
 
 PS_FILES = $(DVI_FILES:.dvi=.ps)
+PDF_FILES = $(DVI_FILES:.dvi=.pdf)
 
 PS_GZ_FILES= $(addsuffix .gz, $(PS_FILES))
 
-INFO_FILES = $(addprefix $(outdir)/, lilypond.info lilypond-internals.info)
+INFO_DOCS = lilypond lilypond-internals music-glossary
+INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
 STEPMAKE_TEMPLATES=tex texinfo documentation
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
-
-# Hmm, what about?
-# local-dist: check-info
-
-info: #  check-info  # -> reinstate when actively hacking doco.
+LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
 
 include $(depth)/make/stepmake.make 
 
@@ -37,10 +35,10 @@ dvi: $(DVI_FILES)
 
 ps: $(PS_FILES)
 
+# Cancel the default info generation rule.  We want to generate info
+# from `.nexi', making sure we don't run LilyPond for inline pictures,
+# when just generating info:
 
-# Cancel default info generation rule.  We want to generate info from
-# `.nexi', making sure we don't run LilyPond for inline pictures, when
-# generating info.
 $(outdir)/%.info: $(outdir)/%.texi
 
 default: 
@@ -49,6 +47,14 @@ default:
 # We must build them by default, otherwise they get built during make install
 info: $(INFO_FILES)
 
+local-help: extra-local-help
+
+extra-local-help:
+       @echo -e "\
+  dvi         update dvi documents\n\
+  info        update info pages\n\
+  ps          update PostScript documents\n\
+"
 
 # Generic rule using % twice not possible?
 # $(outdir)/%/%.html: $(outdir)/%.texi
@@ -85,7 +91,7 @@ deep-symlinks:
 endif
 
 
-local-WWW: $(HTML_FILES) $(datafiles) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
+local-WWW: $(HTML_FILES) $(datafiles) $(PDF_FILES) $(PS_GZ_FILES) $(DEEP_HTML_FILES) info-dir
 
 local-WWW-clean: deep-WWW-clean
 
@@ -118,14 +124,14 @@ ifneq ($(CROSS),yes)
 # there used to be a dependency on a dummy target, to force a rebuild of lilypond-internals every time.
 # however, this triggers compilation during install, which  is a bad thing (tm).
 
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(depth)/$(builddir)/lily/$(outconfbase)/lilypond
-       cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose $(abs-srcdir)/ly/generate-documentation
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused
 $(outdir)/interfaces.itexi: dummy
-       cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond $(abs-srcdir)/ly/generate-interface-doc
 
 else