diff options
| author | Julien Rioux <julien.rioux@gmail.com> | 2013-09-14 22:09:21 +0200 |
|---|---|---|
| committer | Julien Rioux <julien.rioux@gmail.com> | 2013-09-24 10:32:18 +0200 |
| commit | bfdebcb93bebe820c2d5fd6c1bed5c589536472c (patch) | |
| tree | 464a4cba090c236252e4650784d992bab11c952a /make | |
| parent | 409d457d0e623889d88eeff9c576bb74a32f1565 (diff) | |
Build: Clean up lilypond-book includes (issue 3559).
Instead of using a load of includes across the whole tree,
define only the necessary includes for the local directory.
http://code.google.com/p/lilypond/issues/detail?id=3559
Diffstat (limited to 'make')
| -rw-r--r-- | make/doc-i18n-root-vars.make | 8 | ||||
| -rw-r--r-- | make/lilypond-vars.make | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/make/doc-i18n-root-vars.make b/make/doc-i18n-root-vars.make index e279c6d88d..48cfcdbb12 100644 --- a/make/doc-i18n-root-vars.make +++ b/make/doc-i18n-root-vars.make @@ -26,12 +26,14 @@ PDF_FILES := $(TELY_FILES:%.tely=$(top-build-dir)/Documentation/$(outdir)/%.$(IS ITELY_FILES := $(call src-wildcard,*.itely) ITEXI_FILES := $(call src-wildcard,*.itexi) -DOCUMENTATION_INCLUDES = \ +DOCUMENTATION_INCLUDES += \ + -I $(top-build-dir)/Documentation/$(outdir) \ + -I $(top-build-dir)/Documentation/snippets/out \ -I $(top-src-dir)/Documentation/$(ISOLANG)/included \ + -I $(top-src-dir)/Documentation/included \ -I $(top-src-dir)/Documentation \ - -I $(top-build-dir)/Documentation/$(outdir) + -I $(top-src-dir)/input/regression -LILYPOND_BOOK_INCLUDES += $(DOCUMENTATION_INCLUDES) MAKEINFO_FLAGS += --enable-encoding $(DOCUMENTATION_INCLUDES) MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS) diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 985197a4db..e67a570c92 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -27,13 +27,7 @@ MUSICXML2LY = $(script-dir)/musicxml2ly.py CONVERT_LY = $(script-dir)/convert-ly.py LILYPOND_BOOK = $(script-dir)/lilypond-book.py -LILYPOND_BOOK_INCLUDES = -I $(outdir) -I $(src-dir) -I $(input-dir) \ - -I $(top-src-dir)/Documentation -I $(top-build-dir)/Documentation/snippets/out \ - -I $(input-dir)/regression/ -I $(top-src-dir)/Documentation/included/ \ - -I $(top-build-dir)/mf/$(outconfbase)/ \ - -I $(top-build-dir)/mf/out/ \ - -I $(top-src-dir)/Documentation/pictures \ - -I $(top-build-dir)/Documentation/pictures/$(outdir) +LILYPOND_BOOK_INCLUDES = -I $(src-dir) $(DOCUMENTATION_INCLUDES) ## override from cmd line to speed up. ANTI_ALIAS_FACTOR=2 |