X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=f0b566c5ff45d698daca31a21fefb417c9769c66;hb=2086beff8cd9949318c97a2a531edb8f04f45f8c;hp=2c5a6df23ff54dc0a461e16b74ee320194e61e61;hpb=f9efd2c54b174591fa42889557686c7aea356547;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 2c5a6df23f..f0b566c5ff 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -17,15 +17,15 @@ 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
+STEPMAKE_TEMPLATES=tex texinfo omf documentation
 
-# Hmm, what about?
-# local-dist: check-info
+OMF_FILES += $(outdir)/lilypond-internals.html.omf
 
-info: #  check-info  # -> reinstate when actively hacking doco.
+LOCALSTEPMAKE_TEMPLATES=lilypond ly
+LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
 
 include $(depth)/make/stepmake.make 
 
@@ -38,10 +38,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: 
@@ -50,20 +50,28 @@ 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
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$@ --html $<
-	-cp -f $(outdir)/*.png $(outdir)/lilypond
+	-cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond
 	-cp -f $(outdir)/lilypond/index.html $@
 	$(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$@ --html $<
-	-cp -f $(outdir)/*.png $(outdir)/lilypond-internals
+	-cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond-internals
 	-cp -f $(outdir)/lilypond-internals/index.html $@
 	$(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
@@ -120,13 +128,13 @@ ifneq ($(CROSS),yes)
 # however, this triggers compilation during install, which  is a bad thing (tm).
 
 $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(builddir)/lily/$(outconfbase)/lilypond
-	cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose ../$(src-depth)/ly/generate-documentation
+	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) && $(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-interface-doc
+	cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond $(abs-srcdir)/ly/generate-interface-doc
 
 else
 
@@ -138,3 +146,4 @@ $(outdir)/interfaces.itexi:
 	cp dummy-interfaces.itexi $@
 endif
 
+