X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fuser%2FGNUmakefile;h=de0b41538cc516b0c15d208847185233565c88ad;hb=078703a6ab29f75983a55ac2cc35fe5f315da574;hp=e8b8d0dbe5b53b2b13ec0c32bbe182b23a2eed16;hpb=75e2b24fabd5962901580b0d3627cee6b0aa41c1;p=lilypond.git

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index e8b8d0dbe5..de0b41538c 100644
--- 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,7 +30,7 @@ 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 
@@ -123,7 +123,7 @@ 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
 
@@ -150,7 +150,7 @@ $(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 
 	(cd $(outdir)/lilypond/ ; ln -sf ../*.png ../*.ly . )
@@ -159,27 +159,27 @@ $(outdir)/lilypond/index.html: $(outdir)/lilypond.texi $(OUT_PNG_IMAGES)
 # 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 
 	(cd $(outdir)/music-glossary/ ; ln -sf ../*.png ../*.ly . )
@@ -240,8 +240,8 @@ local-clean:
 	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.nexi: $(ITELY_FILES) $(ITEXI_FILES)
@@ -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: $(top-build-dir)/lily/$(outconfbase)/lilypond
+	cd $(outdir) && $(top-build-dir)/lily/$(outconfbase)/lilypond --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) && $(top-build-dir)/lily/$(outconfbase)/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)/*