summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2016-05-09 15:21:09 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2016-05-10 17:11:54 +0200
commit0ea485554699b008e28eab73add8739080292422 (patch)
treed702bdbdbc2ae934593e5cde2fa70de2196b85bb /Makefile
parent2c75a6b39f21361b9813207a11662d9d41cf6a60 (diff)
downloadandroid-node-v8-0ea485554699b008e28eab73add8739080292422.tar.gz
android-node-v8-0ea485554699b008e28eab73add8739080292422.tar.bz2
android-node-v8-0ea485554699b008e28eab73add8739080292422.zip
build,test: fix build-addons dependency chain
* Make the 'extract embedded addons in the documentations' step a normal prerequisite. As an order-only prerequisite, it's sometimes skipped when it shouldn't be. * Make `tools/doc/addon-verify.js` a dependency of that step. Changes to that file should result in a rebuild. PR-URL: https://github.com/nodejs/node/pull/6652 Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index bf0f0dd66d..43249b77f1 100644
--- a/Makefile
+++ b/Makefile
@@ -131,9 +131,9 @@ test/gc/node_modules/weak/build/Release/weakref.node: $(NODE_EXE)
--nodedir="$(shell pwd)"
# Implicitly depends on $(NODE_EXE), see the build-addons rule for rationale.
-test/addons/.docbuildstamp: doc/api/addons.md
+test/addons/.docbuildstamp: tools/doc/addon-verify.js doc/api/addons.md
$(RM) -r test/addons/??_*/
- $(NODE) tools/doc/addon-verify.js
+ $(NODE) $<
touch $@
ADDONS_BINDING_GYPS := \
@@ -144,7 +144,7 @@ ADDONS_BINDING_GYPS := \
test/addons/.buildstamp: $(ADDONS_BINDING_GYPS) \
deps/uv/include/*.h deps/v8/include/*.h \
src/node.h src/node_buffer.h src/node_object_wrap.h \
- | test/addons/.docbuildstamp
+ test/addons/.docbuildstamp
# Cannot use $(wildcard test/addons/*/) here, it's evaluated before
# embedded addons have been generated from the documentation.
for dirname in test/addons/*/; do \