]> git.donarmstrong.com Git - lilypond.git/blobdiff - Documentation/user/GNUmakefile
projects / lilypond.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
*** empty log message ***
[lilypond.git] / Documentation / user / GNUmakefile
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index e8b8d0dbe5b53b2b13ec0c32bbe182b23a2eed16..31094c6bb7ab0c806326dc52631712755753d270 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -1,12 +1,12 @@
 depth=../..
 
-LATEX_FILES =$(wildcard *.latex)
+LATEX_FILES =$(call src-wildcard,*.latex)
 
 # todo: add latex.
 DVI_FILES = $(TELY_FILES:%.tely=$(outdir)/%.dvi)
 
 EXTRA_DIST_FILES= $(LATEX_FILES) $(IMAGES)
-IMAGES=$(wildcard *.png)
+IMAGES=$(call src-wildcard,*.png)
 
 OUT_EPS_IMAGES=$(IMAGES:%.png=$(outdir)/%.eps)
 OUT_PNG_IMAGES=$(IMAGES:%=$(outdir)/%)
@@ -30,10 +30,10 @@ OMF_FILES += $(outdir)/lilypond-internals.html.omf
 LOCALSTEPMAKE_TEMPLATES=lilypond ly
 
 
-TEXINPUTS=$(topdir)/tex::
+TEXINPUTS=$(top-src-dir)/tex::
 export TEXINPUTS
 
-include $(depth)/make/stepmake.make 
+include $(depth)/make/stepmake.make
 
 dvi: $(DVI_FILES)
 
@@ -71,14 +71,14 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
        @echo
        @echo "For images in the INFO docs to work, do: "
        @echo
-       @echo "    (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/out-www/*png .)"
+       @echo "    (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/*png .)"
        @echo "or add something like that to the postinstall script."
        @echo
 else
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
        -install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
        install-info --info-dir=$(infodir) $(outdir)/lilypond.info
-       (cd $(lilypond_infodir) && ln -sf $(webdir)/Documentation/user/out-www/*png .)
+       (cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/*png .)
 endif
 
 local-uninstall-WWW:
@@ -123,11 +123,11 @@ endif
 endif
 
 # All web targets, except info image symlinks and info docs are
-# installed in non-recursing target from TOPDIR
+# installed in non-recursing target from TOP-SRC-DIR
 local-install-WWW: local-install-info
 local-uninstall-WWW: local-uninstall-info
 
-default: 
+default:
 
 
 local-help: extra-local-help
@@ -150,41 +150,41 @@ $(outdir)/lilypond.nexi: $(outdir)/lilypond-internals.texi
 #
 $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
        mkdir -p $(dir $@)
-       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) -I$(outdir) --output=$(outdir)/lilypond --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
        find $(outdir)/lilypond/ -name '*'.png -o -name '*'.ly | xargs rm -f
-# symbolic links to save space 
+# symbolic links to save space
        (cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
 
 #
 # One big page manual
 #
 $(outdir)/lilypond.html: $(outdir)/lilypond.texi
-       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) -I$(outdir) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
 #
 # The split internals reference
 #
 $(outdir)/lilypond-internals/index.html: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)
-       $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) --output=$(outdir)/lilypond-internals --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
 
 #
 # One big page internals reference
 #
 $(outdir)/lilypond-internals.html: $(outdir)/lilypond-internals.texi
-       $(MAKEINFO) --output=$@ --css-include=$(abs-srcdir)/Documentation/texinfo.css --html --no-split --no-headers $<
+       $(MAKEINFO) --output=$@ --css-include=$(top-src-dir)/Documentation/texinfo.css --html --no-split --no-headers $<
 
 #
 # The split glossary
 #
 $(outdir)/music-glossary/index.html: $(outdir)/music-glossary.texi
        mkdir -p $(dir $@)
-       $(MAKEINFO) --output=$(outdir)/music-glossary --css-include=$(abs-srcdir)/Documentation/texinfo.css --html $<
+       $(MAKEINFO) --output=$(outdir)/music-glossary --css-include=$(top-src-dir)/Documentation/texinfo.css --html $<
        find $(outdir)/music-glossary/ -name '*'.png -o -name '*'.ly | xargs rm -f
-# symbolic links to save space 
+# symbolic links to save space
        (cd $(outdir)/music-glossary/ ; ln -sf ../*.png ../*.ly . )
 
-$(outdir)/lilypond.xml: $(outdir)/lilypond.texi 
+$(outdir)/lilypond.xml: $(outdir)/lilypond.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) -I$(outdir) --output=$@ --docbook $<
 
@@ -210,15 +210,15 @@ source-links = $(outdir)/source $(outdir)/lilypond/source $(outdir)/music-glossa
 
 $(outdir)/source:
        @rm -f $(@)
-       ln -sf ../../../ $(@)
+       ln -sf ../../ $(@)
 
 $(outdir)/lilypond/source:
        @rm -f $(@)
-       ln -sf ../../../../ $(@)
+       ln -sf ../../../ $(@)
 
 $(outdir)/music-glossary/source:
        @rm -f $(@)
-       ln -sf ../../../../ $(@)
+       ln -sf ../../../ $(@)
 
 local-WWW: $(HTML_FILES) $(DEEP_HTML_FILES)\
  $(datafiles) $(PDF_FILES) $(source-links) info info-dir
@@ -236,14 +236,14 @@ $(outdir)/%.bib: %.bib
        ln -f $< $@
 
 local-clean:
-       rm -f fonts.aux fonts.log feta*.tfm feta*.*pk 
+       rm -f fonts.aux fonts.log feta*.tfm feta*.*pk
        rm -rf $(outdir)/lilypond $(outdir)/lilypond-internals $(outdir)/music-glossary
 
 # lilypond.texi deps
-$(builddir)/mf/$(outconfbase)/feta16list.ly:
-       $(MAKE) -C $(topdir)/mf
+$(top-build-dir)/mf/$(outconfbase)/feta16list.ly:
+       $(MAKE) -C $(top-src-dir)/mf
 
-$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES) 
+$(outdir)/lilypond.texi: $(ITELY_FILES) $(ITEXI_FILES)
 $(outdir)/lilypond.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
 # Prevent building music-glossary.texi from default target
@@ -258,15 +258,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
-       cd $(outdir) && $(builddir)/lily/$(outconfbase)/lilypond --verbose $(abs-srcdir)/ly/generate-documentation
+$(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: $(LILYPOND_BINARY)
+       cd $(outdir) && $(LILYPOND_BINARY) --verbose $(top-src-dir)/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 $(abs-srcdir)/ly/generate-interface-doc
+       cd $(outdir) && lilypond $(top-src-dir)/ly/generate-interface-doc
 
 else
 
@@ -281,9 +281,5 @@ endif
 local-clean: local-delete
 
 local-delete:
-       -for i in $$(seq 0 9); do \
-               for j in dvi eps eps.bbox eps.trans eps.trans.ps ps log png tex; do \
-                       rm -f $(outdir)/lily-$$i*$$j; \
-               done; \
-       done
+       find $(outdir)/ -name 'lily-[0-9]*' | xargs rm -f
        -rm -f $(outdir)/*
Debian packaging of lilypond