* lily/ledger-line-spanner.cc (print): swap linear_combination

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index f06890b465d412a571e6c84b2a866c4c430f33f5..073924a74ba3326ad0cf85f9c0f1b600c576be16 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -35,6 +35,8 @@ ps: $(PS_FILES)
 
 info: $(INFO_FILES)
 
+xml: $(outdir)/lilypond/lilypond.xml $(outdir)/lilypond-internals/lilypond-internals.xml
+
 # There are two modes for info: with and without images.
 ifeq ($(out),www)
 
@@ -83,6 +85,7 @@ extra-local-help:
   dvi         update dvi documents\n\
   info        update info pages\n\
   ps          update PostScript documents\n\
+  xml        update Docbook xml documentation\n\
 "
 
 # Generic rule using % twice not possible?
@@ -93,16 +96,26 @@ $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 
 $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi 
        mkdir -p $(dir $@)
-       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(builddir)/Documentation/texinfo.css --html $<
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(builddir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
        perl -i~ -pe 's!../lilypond-internals!lilypond-internals/!g' $(outdir)/lilypond.html
-       rm -f $(outdir)/lilypond/*.png $(outdir)/lilypond/*.ly 
-       -ln -f $(outdir)/*.png $(outdir)/*.ly $(outdir)/lilypond/
+       find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
+# symbolic links to save space 
+       (cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)
-       $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(builddir)/Documentation/texinfo.css --html $<
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(builddir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
+
+$(outdir)/lilypond/lilypond.xml: $(outdir)/lilypond.texi 
+       mkdir -p $(dir $@)
+       $(MAKEINFO) -I$(outdir) --output=$@ --docbook $<
+       perl -i~ -pe 's!../lilypond-internals!lilypond-internals/!g' $(outdir)/lilypond.xml
+
+$(outdir)/lilypond-internals/lilypond-internals.xml: $(outdir)/lilypond-internals.texi
+       mkdir -p $(dir $@)
+       $(MAKEINFO) --output=$(outdir)/lilypond-internals --docbook $<
 
 ifeq ($(SPLITTING_MAKEINFO),yes)
 
@@ -165,15 +178,15 @@ ifneq ($(CROSS),yes)
 # 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-bin
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin --verbose $(abs-srcdir)/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
        rm -f $(outdir)/lilypond-internals.nexi
        -ln $(outdir)/lilypond-internals.texi $(outdir)/lilypond-internals.nexi
 
 
 ## unused
 $(outdir)/interfaces.itexi: dummy
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond-bin $(abs-srcdir)/ly/generate-interface-doc
+       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond $(abs-srcdir)/ly/generate-interface-doc
 
 else