* Merge from stable:

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 207ee6654ba151d461b18822d3d554ef77b70616..08a901afd7856cd91177c64d9311a320414744c3 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -8,23 +8,21 @@ LATEX_FILES =$(wildcard *.latex)
 # todo: add latex.
 DVI_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.dvi))
 
-EXTRA_DIST_FILES= $(LATEX_FILES)    $(wildcard *.itexi *.itely)
+EXTRA_DIST_FILES= $(LATEX_FILES)
 
 HTML_FILES = $(addprefix $(outdir)/, $(TELY_FILES:.tely=.html))
 
-PS_FILES = $(DVI_FILES:.dvi=.ps)  $(OUTDOC_FILES:.doc=.ps) $(OUTTEX_FILES:.tex=.ps)
+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
+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,51 +47,51 @@ default:
 # We must build them by default, otherwise they get built during make install
 info: $(INFO_FILES)
 
+local-help: extra-local-help
 
-# The new pretest version of makeinfo, 4.0a splits html files into their own
-# directory.  Available from
-# ftp://texinfo.org/texinfo/pretests/texinfo-4.0a.tar.gz
-SPLITTING_MAKEINFO = $(shell makeinfo --version | egrep '4.0((.jcn[2,3])|a)')
-
+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)/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)/lilypond-internals/index.html $@
        $(deep-footify) $(shell find $(outdir)/$(*F)/*.html)
 
-ifneq ($(SPLITTING_MAKEINFO),)
+ifeq ($(SPLITTING_MAKEINFO),yes)
 
 DEEP_HTML_FILES = $(outdir)/lilypond/lilypond.html $(outdir)/lilypond-internals/lilypond-internals.html
 
 else
 
-DEEP_HTML_FILES = $(outdir)/lilypond.html $(outdir)/lilypond-internals.html
+# Links referred to by Documentation index
+LILYPOND_LINKS=Reference-Manual.html Tutorial.html Ly2dvi.html Midi2ly.html
 
 local-WWW: deep-symlinks
 
-
-
-# Links referred to by Documentation index
-LILYPOND_LINKS=Reference-Manual.html Features.html Ly2dvi.html Midi2ly.html
-
 deep-symlinks:
-       cd $(outdir) && rm -f lilypond && ln -s . lilypond
-       cd $(outdir) && rm -f lilypond-internals && ln -s . lilypond-internals
-       cd $(outdir) && $(foreach i, $(LILYPOND_LINKS),\
+       mkdir -p $(outdir)/lilypond
+       cd $(outdir)/lilypond && $(foreach i, $(LILYPOND_LINKS),\
                rm -f $(i) && ln -s lilypond.html $(i) &&) true
+
 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
 
@@ -115,19 +113,25 @@ local-clean:
        rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
        rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals
 
-$(outdir)/lilypond.nexi: $(outdir)/interfaces.itexi
-$(outdir)/lilypond.texi: $(outdir)/interfaces.itexi
+#$(outdir)/lilypond.nexi: $(outdir)/interfaces.itexi
+#$(outdir)/lilypond.texi: $(outdir)/interfaces.itexi
 
 # Rules for the automatically generated documentation
 # When cross-compiling, we don't have lilypond, so we fake
 ifneq ($(CROSS),yes)
-dummy:
-$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: dummy
-       cd $(outdir) && ../$(depth)/$(builddir)/lily/$(outconfbase)/lilypond ../$(src-depth)/ly/generate-documentation
+
+
+# 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: $(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
 
@@ -136,6 +140,6 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi:
        touch $(outdir)/$(*F).nexi
 
 $(outdir)/interfaces.itexi:
-       cp $(src-depth)/Documentation/user/dummy-interfaces.itexi $@
+       cp dummy-interfaces.itexi $@
 endif