[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Build everything on the first pass of make. (issue 13333048)
From: |
julien . rioux |
Subject: |
Build everything on the first pass of make. (issue 13333048) |
Date: |
Wed, 11 Sep 2013 10:04:54 +0000 |
Reviewers: John Mandereau, lemzwerg,
Message:
Please review.
Description:
Build everything on the first pass of make.
Everything should be built and up-to-date after a one-shot `make' call.
Currently, this is not the case: fonts are being rebuilt on the secnod
pass. This required a dependency fix for emmentaler fonts. The
dependencies are ordered so that fonts aren't rebuilt on a subsequent
call to make.
For one-shot `make doc', we also have issues, and things are a bit more
difficult to track down. Dependencies for web.texi in translated
languages are fixed.
Please review this at https://codereview.appspot.com/13333048/
Affected files (+5, -4 lines):
M make/doc-i18n-root-rules.make
M mf/GNUmakefile
Index: make/doc-i18n-root-rules.make
diff --git a/make/doc-i18n-root-rules.make b/make/doc-i18n-root-rules.make
index
d374e5ca7339d97b03dace3d413b210eb5ee2174..a8e7ab5edef58af094481bc22cf685056b893d43
100644
--- a/make/doc-i18n-root-rules.make
+++ b/make/doc-i18n-root-rules.make
@@ -2,7 +2,7 @@
.SUFFIXES: .html .info .texi .texinfo
# Explicitly list the dependencies on generated content
-$(outdir)/web.texi: $(outdir)/weblinks.itexi
+$(outdir)/web.texi: $(outdir)/we-wrote.itexi $(outdir)/others-did.itexi
$(outdir)/weblinks.itexi
$(top-build-dir)/Documentation/$(outdir)/%/index.$(ISOLANG).html:
$(outdir)/%/index.html $(TRANSLATION_LILY_IMAGES)
mkdir -p $(dir $@)
Index: mf/GNUmakefile
diff --git a/mf/GNUmakefile b/mf/GNUmakefile
index
f81b56dabef7f8de1bd4cd73b9bec5c7670b21bd..325bf8f9c97a464105822c873f14cddbfc7fd76f
100644
--- a/mf/GNUmakefile
+++ b/mf/GNUmakefile
@@ -99,9 +99,10 @@ $(PE_SCRIPTS): $(buildscript-dir)/gen-emmentaler-scripts
$< --dir=$(outdir)
-# Make tfm files first, log files last,
-# so that normally log files aren't made twice
-ALL_GEN_FILES = $(LOG_FILES) \
+# Generate emmentaler-*.pe scripts first, and *.otf, *.svg, *.woff files
last,
+# so that normally these files aren't regenerated on a subsequent call to
make.
+ALL_GEN_FILES = $(PE_SCRIPTS) \
+ $(LOG_FILES) \
$(ENC_FILES) \
$(LISP_FILES) \
$(OTF_TABLES) \
- Build everything on the first pass of make. (issue 13333048),
julien . rioux <=