Skip to content

Commit 9281749

Browse files
committed
build: update recursive make calls to use explicit makefile reference
--- type: pre_commit_static_analysis_report description: Results of running static analysis checks when committing changes. report: - task: lint_filenames status: passed - task: lint_editorconfig status: passed - task: lint_markdown status: na - task: lint_package_json status: na - task: lint_repl_help status: na - task: lint_javascript_src status: na - task: lint_javascript_cli status: na - task: lint_javascript_examples status: na - task: lint_javascript_tests status: na - task: lint_javascript_benchmarks status: na - task: lint_python status: na - task: lint_r status: na - task: lint_c_src status: na - task: lint_c_examples status: na - task: lint_c_benchmarks status: na - task: lint_c_tests_fixtures status: na - task: lint_shell status: na - task: lint_typescript_declarations status: na - task: lint_typescript_tests status: na - task: lint_license_headers status: passed ---
1 parent 9be4cfa commit 9281749

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

tools/make/lib/benchmark/c.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ benchmark-c-files:
113113
# make benchmark-random-c RANDOM_SELECTION_SIZE=10
114114
#/
115115
benchmark-random-c: $(NODE_MODULES)
116-
$(QUIET) make -s list-random-lib-pkgs PACKAGES_PATTERN='manifest.json' | while read -r pkg; do \
116+
$(QUIET) $(MAKE) -f $(this_file) -s list-random-lib-pkgs PACKAGES_PATTERN='manifest.json' | while read -r pkg; do \
117117
echo ""; \
118118
echo "Running benchmark: $$pkg"; \
119119
NODE_ENV="$(NODE_ENV_BENCHMARK)" \
120120
NODE_PATH="$(NODE_PATH_BENCHMARK)" \
121-
make benchmark-c BENCHMARKS_FILTER="$$pkg/.*" || exit 1; \
121+
$(MAKE) -f $(this_file) benchmark-c BENCHMARKS_FILTER="$$pkg/.*" || exit 1; \
122122
done
123123

124124
.PHONY: benchmark-random-c

tools/make/lib/benchmark/javascript.mk

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,22 +87,22 @@ benchmark-javascript-files: $(NODE_MODULES)
8787
#/
8888
benchmark-random-javascript: $(NODE_MODULES)
8989
ifeq ($(BUILD_NATIVE_ADDONS), true)
90-
$(QUIET) make -s list-random-lib-pkgs | while read -r pkg; do \
90+
$(QUIET) $(MAKE) -f $(this_file) -s list-random-lib-pkgs | while read -r pkg; do \
9191
echo ""; \
9292
echo "Running benchmark: $$pkg"; \
9393
pattern=$$(echo "$$pkg" | sed -n -e 's/^.*\(@stdlib\)/\1/p') \
94-
NODE_ADDONS_PATTERN="$$pattern" make install-node-addons; \
94+
NODE_ADDONS_PATTERN="$$pattern" $(MAKE) -f $(this_file) install-node-addons; \
9595
NODE_ENV="$(NODE_ENV_BENCHMARK)" \
9696
NODE_PATH="$(NODE_PATH_BENCHMARK)" \
97-
make benchmark-javascript BENCHMARKS_FILTER="$$pkg/.*" || exit 1; \
97+
$(MAKE) -f $(this_file) benchmark-javascript BENCHMARKS_FILTER="$$pkg/.*" || exit 1; \
9898
done
9999
else
100-
$(QUIET) make -s list-random-lib-pkgs | while read -r pkg; do \
100+
$(QUIET) $(MAKE) -f $(this_file) -s list-random-lib-pkgs | while read -r pkg; do \
101101
echo ""; \
102102
echo "Running benchmark: $$pkg"; \
103103
NODE_ENV="$(NODE_ENV_BENCHMARK)" \
104104
NODE_PATH="$(NODE_PATH_BENCHMARK)" \
105-
make benchmark-javascript BENCHMARKS_FILTER="$$pkg/.*" || exit 1; \
105+
$(MAKE) -f $(this_file) benchmark-javascript BENCHMARKS_FILTER="$$pkg/.*" || exit 1; \
106106
done
107107
endif
108108

tools/make/lib/examples/c.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ examples-c-files:
113113
# make examples-random-c RANDOM_SELECTION_SIZE=10
114114
#/
115115
examples-random-c: $(NODE_MODULES)
116-
$(QUIET) make -s list-random-lib-pkgs PACKAGES_PATTERN='binding.gyp' | while read -r pkg; do \
116+
$(QUIET) $(MAKE) -f $(this_file) -s list-random-lib-pkgs PACKAGES_PATTERN='binding.gyp' | while read -r pkg; do \
117117
echo ""; \
118118
echo "Running example: $$pkg"; \
119119
NODE_ENV="$(NODE_ENV_EXAMPLES)" \
120120
NODE_PATH="$(NODE_PATH_EXAMPLES)" \
121-
make examples-c EXAMPLES_FILTER="$$pkg/.*" || exit 1; \
121+
$(MAKE) -f $(this_file) examples-c EXAMPLES_FILTER="$$pkg/.*" || exit 1; \
122122
done
123123

124124
.PHONY: examples-random-c

tools/make/lib/examples/javascript.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ examples-javascript-files: $(NODE_MODULES)
8585
# make examples-random-javascript RANDOM_SELECTION_SIZE=10
8686
#/
8787
examples-random-javascript: $(NODE_MODULES)
88-
$(QUIET) make -s list-random-lib-pkgs | while read -r pkg; do \
88+
$(QUIET) $(MAKE) -f $(this_file) -s list-random-lib-pkgs | while read -r pkg; do \
8989
echo ""; \
9090
echo "Running example: $$pkg"; \
9191
NODE_ENV="$(NODE_ENV_EXAMPLES)" \
9292
NODE_PATH="$(NODE_PATH_EXAMPLES)" \
93-
make examples-javascript EXAMPLES_FILTER="$$pkg/.*" || exit 1; \
93+
$(MAKE) -f $(this_file) examples-javascript EXAMPLES_FILTER="$$pkg/.*" || exit 1; \
9494
done
9595

9696
.PHONY: examples-random-javascript

tools/make/lib/ls/pkgs/unpublished.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
# make list-pkgs-unpublished LIST_PKGS_STANDALONES_DIR="$PWD/lib/node_modules/\@stdlib/utils"
3131
#/
3232
list-pkgs-unpublished:
33-
$(QUIET) pkgs=$$(make --no-print-directory list-pkgs-standalones | tr '\n' ' '); \
33+
$(QUIET) pkgs=$$($(MAKE) -f $(this_file) --no-print-directory list-pkgs-standalones | tr '\n' ' '); \
3434
unpublished_pkgs=""; \
3535
for pkg in $$pkgs; do \
3636
if [ "$${pkg#*_tools}" != "$$pkg" ]; then \
@@ -42,4 +42,4 @@ list-pkgs-unpublished:
4242
done; \
4343
echo "$$unpublished_pkgs"
4444

45-
.PHONY: list-pkgs-unpublished
45+
.PHONY: list-pkgs-unpublished

tools/make/lib/test-ci/travis_browsers.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ TRAVIS_HEADLESS_BROWSER ?= xvfb-run
3333
# make test-browsers-travis
3434
#/
3535
test-browsers-travis: $(NODE_MODULES)
36-
$(QUIET) $(TRAVIS_HEADLESS_BROWSER) make -f $(this_file) test-browsers
36+
$(QUIET) $(TRAVIS_HEADLESS_BROWSER) $(MAKE) -f $(this_file) test-browsers
3737

3838
.PHONY: test-browsers-travis

0 commit comments

Comments
 (0)