Merge branch 'master' of /home/lilycvs/git/lily/

[lilypond.git] / make / lilypond-vars.make

diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make
index d9946a8914baddab69e0d54e884da51ed60516e1..7fa9aa9ab3f222dee7bddbbb27568213651716f0 100644 (file)
--- a/make/lilypond-vars.make
+++ b/make/lilypond-vars.make
@@ -1,46 +1,57 @@
 ##
 ## settings to run LilyPond
+ifeq ($(LILYPOND_EXTERNAL_BINARY),)
 
+# environment settings.
+export PATH:=$(top-build-dir)/lily/$(outconfbase):$(top-build-dir)/buildscripts/$(outconfbase):$(top-build-dir)/scripts/$(outconfbase):$(PATH):
+export LILYPOND_BINARY=$(top-build-dir)/$(outconfbase)/bin/lilypond
+else
 
-export PATH:=$(builddir)/lily/$(outconfbase):$(builddir)/buildscripts/$(outconfbase):$(builddir)/scripts/$(outconfbase):$(PATH):
-
-# LilyPond is often run from within $(outdir), making a relative
-# PREFIX incorrect.
-export LILYPONDPREFIX:=$(build_lilypond_datadir)/$(TOPLEVEL_VERSION)
-
-export PYTHONPATH:=$(builddir)/python/$(outconfbase):$(PYTHONPATH)
-
-export GUILE_LOAD_PATH:=$(builddir):$(GUILE_LOAD_PATH)
-
-## arg, TEXINPUTS, TFMFONTS, MFINPUTS may still override and thus break this
-export TEXMF:={$(LILYPONDPREFIX),$(shell kpsexpand \$$TEXMF)}
-
-export MFINPUTS:=
-export TEXINPUTS:=
-export TFMFONTS:=
-export extra_mem_top=1000000
-export extra_mem_bottom=1000000
-export pool_size=500000
-
+## better not take the binaries  from a precompiled bundle, as they
+## rely on env vars for relocation.
+##
 
-ifdef DEB_BUILD
-export PKFONTS := $(topdir)/mf/out
-export MT_DESTROOT := $(topdir)/mf/out
-export DVIPSMAKEPK := mktexpk --destdir $(topdir)/mf/out
+#export PATH:=$(dir $(LILYPOND_EXTERNAL_BINARY)):$(PATH)
+export LILYPOND_BINARY=$(LILYPOND_EXTERNAL_BINARY)
 endif
 
+export PYTHONPATH:=$(top-build-dir)/python/$(outconfbase):$(PYTHONPATH)
 
 the-script-dir=$(wildcard $(script-dir))
 
-
 ABC2LY = $(script-dir)/abc2ly.py
+MUSICXML2LY = $(script-dir)/musicxml2ly.py
 CONVERT_LY = $(script-dir)/convert-ly.py
-LILYPOND = $(builddir)/lily/$(outconfbase)/lilypond
 LILYPOND_BOOK = $(script-dir)/lilypond-book.py
-LILYPOND_BOOK_INCLUDES = -I $(pwd) -I $(outdir) -I$(input-dir) -I $(input-dir)/regression/ -I $(input-dir)/test/ -I $(input-dir)/tutorial/ -I $(builddir)/mf/$(outconfbase)/  -I $(builddir)/mf/out/
-LILYPOND_BOOK_FLAGS = --process="lilypond --backend eps  --formats=ps,png --header=texidoc -I $(srcdir)/input/test -e '(ly:set-option (quote internal-type-checking) \#t)'"
+
+LILYPOND_BOOK_INCLUDES = -I $(src-dir)/ -I $(outdir) -I $(input-dir) -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 $(input-dir)/lsr/
+
+## override from cmd line to speed up. 
+ANTI_ALIAS_FACTOR=2
+LILYPOND_JOBS=$(if $(CPU_COUNT),-djob-count=$(CPU_COUNT),)
+LANG_TEXIDOC_FLAG=$(if $(ISOLANG),--header=texidoc$(ISOLANG),)
+LILYPOND_BOOK_LILYPOND_FLAGS=-dbackend=eps --formats=ps,png,pdf $(LILYPOND_JOBS) -dinclude-eps-fonts -dgs-load-fonts --header=texidoc $(LANG_TEXIDOC_FLAG) -I $(top-src-dir)/input/manual -dcheck-internal-types -ddump-signatures -danti-alias-factor=$(ANTI_ALIAS_FACTOR)
+LILYPOND_BOOK_VERBOSE = --verbose
+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)
+LY2DVI = $(LILYPOND_BINARY)
 LYS_TO_TELY = $(buildscript-dir)/lys-to-tely.py
+