X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flilypond-vars.make;h=1daacd7932ba0cadc4f856099b8bdb08d92bf761;hb=754cc32a99b43f5fee5ebf7ed1213017268d4939;hp=83f330c9fd583c1c342b851ad334f625b3256a54;hpb=79d916d1fa2a921732f7432e87b25058693be370;p=lilypond.git

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index 83f330c9fd..ac5dae67ad 100644
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,44 +1,82 @@
+##
+## settings to run LilyPond
+ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 
-export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH)
-
-export MFINPUTS:=$(topdir)/mf/:$(MFINPUTS)::
-export TEXINPUTS:=$(topdir)/mf/out/:$(topdir)/tex/:$(topdir)/ps/:$(TEXINPUTS):$(pwd)::
-export LILYINCLUDE:=$(topdir)/ps:$(topdir)/scm:$(topdir)/ly:$(topdir)/mf/out::$(TEX_TFMDIR):$(LILYINCLUDE)
-export TFMFONTS=$(topdir)/mf/out:
+# environment settings.
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(buildscript-dir):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
+else
 
-export LILYPONDPREFIX:=$(depth)/
-export PYTHONPATH:=$(buildscript-dir)/$(outdir):$(PYTHONPATH)
+## better not take the binaries  from a precompiled bundle, as they
+## rely on env vars for relocation.
+##
 
-# guile load path?
+#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
+endif
 
-the-script-dir=$(wildcard $(script-dir))
+LANGS=$(shell $(PYTHON) $(top-src-dir)/python/langdefs.py)
 
-ifneq ($(the-script-dir),)
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 
-### some versions apparently choke on $(message)
-### $(message running from source tree stepmake)
+the-script-dir=$(wildcard $(script-dir))
 
 ABC2LY = $(script-dir)/abc2ly.py
+MUSICXML2LY = $(script-dir)/musicxml2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(depth)/$(builddir)/lily/$(outconfbase)/lilypond
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(input-dir)/tricks/ -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/
-LY2DVI = $(script-dir)/ly2dvi.py
-PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh
-PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh
 
+LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir)	\
+ -I $(input-dir)/lsr/ -I $(input-dir)/regression/ -I $(input-dir)/manual/ \
+ -I $(input-dir)/tutorial/ -I $(top-build-dir)/mf/$(outconfbase)/	\
+ -I $(top-build-dir)/mf/out/ -I $(top-src-dir)/input/manual \
+ -I $(top-src-dir)/Documentation
+
+## override from cmd line to speed up. 
+ANTI_ALIAS_FACTOR=2
+LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
+LANG_TEXIDOC_FLAGS:=$(foreach lang,$(LANGS),--header=texidoc$(lang))
+LANG_DOCTITLE_FLAGS:=$(foreach lang,$(LANGS),--header=doctitle$(lang))
+
+LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps \
+--formats=ps,png,pdf \
+$(LILYPOND_JOBS) \
+-dinclude-eps-fonts \
+-dgs-load-fonts \
+--header=doctitle \
+$(LANG_DOCTITLE_FLAGS) \
+--header=texidoc \
+$(LANG_TEXIDOC_FLAGS) \
+-dcheck-internal-types \
+-ddump-signatures \
+-danti-alias-factor=$(ANTI_ALIAS_FACTOR)
+
+ifdef QUIET_BUILD
+LILYPOND_BOOK_VERBOSE =
 else
-### some versions apparently choke on $(message)
-### $(message running from installed stepmake)
-
-ABC2LY = $(shell $(SHELL) -c 'type -p abc2ly')
-CONVERT_LY = $(shell $(SHELL) -c 'type -p convert-ly')
-LILYPOND = $(shell $(SHELL) -c 'type -p lilypond')
-LILYPOND_BOOK = $(shell $(SHELL) -c 'type -p lilypond-book')
-LILYPOND_BOOK_INCLUDES = -I. -I.. -I$(outdir)
-LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi')
-PS_TO_GIFS = $(shell $(SHELL) -c 'type -p ps-to-gifs')
-PS_TO_PNGS = $(shell $(SHELL) -c 'type -p ps-to-pngs')
+LILYPOND_BOOK_VERBOSE = --verbose
+endif
+
+LILYPOND_BOOK_INFO_IMAGES_DIR = $(if $(INFO_IMAGES_DIR),--info-images-dir=$(INFO_IMAGES_DIR),)
+LILYPOND_BOOK_FLAGS = $(LILYPOND_BOOK_VERBOSE) $(LILYPOND_BOOK_INFO_IMAGES_DIR)
 
+ifeq ($(out),)
+LILYPOND_BOOK_PROCESS = true
+LILYPOND_BOOK_FLAGS += --skip-lily-check
+else
+LILYPOND_BOOK_PROCESS = $(LILYPOND_BINARY)
+endif
+ifeq ($(out),test)
+LILYPOND_BOOK_FLAGS += --skip-png-check
 endif
 
+TEXINPUTS=$(top-src-dir)/tex/::
+export TEXINPUTS
+
+export LYDOC_LOCALEDIR:= $(top-build-dir)/Documentation/po/out-www
+
+#texi-html for www only:
+LILYPOND_BOOK_FORMAT=$(if $(subst out-www,,$(notdir $(outdir))),texi,texi-html)
+LY2DVI = $(LILYPOND_BINARY)
+LYS_TO_TELY = $(buildscript-dir)/lys-to-tely
+