RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

make: use $(MAKE) instead of direct make call

Browse Source
This commit is contained in:
Cenk Gündoğan 2020-07-03 11:17:57 +02:00
parent 2ed76e2d45
commit 7aa499d5f1
24 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.include
View File

@ -729,7 +729,7 @@ list-ttys:
$(Q)$(RIOTTOOLS)/usb-serial/list-ttys.sh $(Q)$(RIOTTOOLS)/usb-serial/list-ttys.sh
doc: doc:
make -BC $(RIOTBASE) doc $(MAKE) -BC $(RIOTBASE) doc
debug: $(DEBUGDEPS) debug: $(DEBUGDEPS)
$(call check_cmd,$(DEBUGGER),Debug program) $(call check_cmd,$(DEBUGGER),Debug program)

2
boards/common/msba2/Makefile.include
View File

@ -6,7 +6,7 @@ BOARDS_COMMON_MSBA2_DIR := $(patsubst %/,%,$(dir $(lastword $(MAKEFILE_LIST))))
MSBA2_TOOLS = $(BOARDS_COMMON_MSBA2_DIR)/tools MSBA2_TOOLS = $(BOARDS_COMMON_MSBA2_DIR)/tools
LPC2K_PGM = $(MSBA2_TOOLS)/bin/lpc2k_pgm LPC2K_PGM = $(MSBA2_TOOLS)/bin/lpc2k_pgm
$(LPC2K_PGM): FORCE $(LPC2K_PGM): FORCE
env -i PATH=$(PATH) make -C $(MSBA2_TOOLS) env -i PATH=$(PATH) $(MAKE) -C $(MSBA2_TOOLS)
FLASHDEPS += $(if $(findstring $(LPC2K_PGM),$(FLASHER)),$(LPC2K_PGM)) FLASHDEPS += $(if $(findstring $(LPC2K_PGM),$(FLASHER)),$(LPC2K_PGM))
FLASHER ?= $(LPC2K_PGM) FLASHER ?= $(LPC2K_PGM)

2
boards/teensy31/Makefile.include
View File

@ -15,7 +15,7 @@ PORT_DARWIN ?= $(firstword $(sort $(wildcard /dev/tty.usbserial-*)))
$(TEENSY_LOADER): $(TEENSY_LOADER):
@echo "[INFO] teensy_loader binary not found - building it from source now" @echo "[INFO] teensy_loader binary not found - building it from source now"
CC= CFLAGS= make -C $(RIOTTOOLS)/teensy-loader-cli CC= CFLAGS= $(MAKE) -C $(RIOTTOOLS)/teensy-loader-cli
@echo "[INFO] teensy_loader binary successfully build!" @echo "[INFO] teensy_loader binary successfully build!"
# setup serial terminal # setup serial terminal

2
dist/tools/Makefile vendored
View File

@ -5,4 +5,4 @@ HOST_TOOLS=ethos uhcpd sliptty
all: $(HOST_TOOLS) all: $(HOST_TOOLS)
$(HOST_TOOLS): $(HOST_TOOLS):
make -C $@ $(MAKE) -C $@

2
dist/tools/pic32prog/Makefile vendored
View File

@ -14,7 +14,7 @@ include $(RIOTBASE)/pkg/pkg.mk
all: all:
@echo "[INFO] compiling pic32prog from source now" @echo "[INFO] compiling pic32prog from source now"
@env -i PATH=$(PATH) TERM=$(TERM) make -C $(PKG_BUILD_DIR) @env -i PATH=$(PATH) TERM=$(TERM) $(MAKE) -C $(PKG_BUILD_DIR)
@mv $(PKG_BUILD_DIR)/pic32prog pic32prog @mv $(PKG_BUILD_DIR)/pic32prog pic32prog
distclean:: distclean::

4
examples/gnrc_border_router/Makefile
View File

@ -122,7 +122,7 @@ endif
.PHONY: host-tools .PHONY: host-tools
host-tools: host-tools:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS) $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)
# define native specific targets to only run UHCP daemon when required # define native specific targets to only run UHCP daemon when required
ifneq (,$(filter native,$(BOARD))) ifneq (,$(filter native,$(BOARD)))
@ -136,7 +136,7 @@ endif
ifeq (slip,$(UPLINK)) ifeq (slip,$(UPLINK))
sliptty: sliptty:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/sliptty $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/sliptty
endif endif
# Set a custom channel if needed # Set a custom channel if needed

2
examples/suit_update/Makefile
View File

@ -105,6 +105,6 @@ include $(RIOTBASE)/Makefile.include
.PHONY: host-tools .PHONY: host-tools
host-tools: host-tools:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS) $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)
include $(RIOTMAKE)/default-radio-settings.inc.mk include $(RIOTMAKE)/default-radio-settings.inc.mk

2
makefiles/app_dirs.inc.mk
View File

@ -20,7 +20,7 @@ info-applications:
# All applications / board output of `info-boards-supported`. # All applications / board output of `info-boards-supported`.
info-applications-supported-boards: info-applications-supported-boards:
@for dir in $(APPLICATION_DIRS); do \ @for dir in $(APPLICATION_DIRS); do \
make --no-print-directory -C $${dir} info-boards-supported 2>/dev/null | xargs -n 1 echo $${dir}; \ $(MAKE) --no-print-directory -C $${dir} info-boards-supported 2>/dev/null | xargs -n 1 echo $${dir}; \
done done
# BOARDS values from 'boards.inc.mk' to only evaluate it once # BOARDS values from 'boards.inc.mk' to only evaluate it once
info-applications-supported-boards: export BOARDS ?= info-applications-supported-boards: export BOARDS ?=

2
makefiles/docker.inc.mk
View File

@ -291,7 +291,7 @@ docker_run_make = \
$(DOCKER_ENVIRONMENT_CMDLINE) \ $(DOCKER_ENVIRONMENT_CMDLINE) \
$3 \ $3 \
-w '$(DOCKER_APPDIR)' '$2' \ -w '$(DOCKER_APPDIR)' '$2' \
make $(DOCKER_OVERRIDE_CMDLINE) $4 $1 $(MAKE) $(DOCKER_OVERRIDE_CMDLINE) $4 $1
# This will execute `make $(DOCKER_MAKECMDGOALS)` inside a Docker container. # This will execute `make $(DOCKER_MAKECMDGOALS)` inside a Docker container.
# We do not push the regular $(MAKECMDGOALS) to the container's make command in # We do not push the regular $(MAKECMDGOALS) to the container's make command in

2
makefiles/scan-build.inc.mk
View File

@ -95,7 +95,7 @@ endif # BUILD_IN_DOCKER
$(Q)mkdir -p '$(SCANBUILD_OUTPUTDIR)' $(Q)mkdir -p '$(SCANBUILD_OUTPUTDIR)'
$(Q)env -i $(ENVVARS) \ $(Q)env -i $(ENVVARS) \
scan-build -o '$(SCANBUILD_OUTPUTDIR)' $(SCANBUILD_ARGS) \ scan-build -o '$(SCANBUILD_OUTPUTDIR)' $(SCANBUILD_ARGS) \
make -C $(CURDIR) all $(strip $(CMDVARS)) FORCE_ASSERTS=1 $(MAKE) -C $(CURDIR) all $(strip $(CMDVARS)) FORCE_ASSERTS=1
..scan-build-view: scan-build-analyze ..scan-build-view: scan-build-analyze
@echo "Showing most recent report in your web browser..." @echo "Showing most recent report in your web browser..."

2
makefiles/tools/kconfiglib.inc.mk
View File

@ -6,7 +6,7 @@ MERGECONFIG ?= $(RIOTTOOLS)/kconfiglib/merge_config.py
$(BASE_MENUCONFIG): $(BASE_MENUCONFIG):
@echo "[INFO] Kconfiglib not found - getting it" @echo "[INFO] Kconfiglib not found - getting it"
@make -C $(RIOTTOOLS)/kconfiglib @$(MAKE) -C $(RIOTTOOLS)/kconfiglib
@echo "[INFO] Kconfiglib downloaded" @echo "[INFO] Kconfiglib downloaded"
$(GENCONFIG): $(BASE_MENUCONFIG) $(GENCONFIG): $(BASE_MENUCONFIG)

16
makefiles/tools/targets.inc.mk
View File

@ -9,38 +9,38 @@
# target for building the bossac binary # target for building the bossac binary
$(RIOTTOOLS)/bossa-$(BOSSA_VERSION)/bossac: $(RIOTTOOLS)/bossa-$(BOSSA_VERSION)/bossac:
@echo "[INFO] bossac $(BOSSA_VERSION) binary not found - building it from source" @echo "[INFO] bossac $(BOSSA_VERSION) binary not found - building it from source"
@make -C $(RIOTTOOLS)/bossa-$(BOSSA_VERSION) @$(MAKE) -C $(RIOTTOOLS)/bossa-$(BOSSA_VERSION)
@echo "[INFO] bossac $(BOSSA_VERSION) binary successfully built!" @echo "[INFO] bossac $(BOSSA_VERSION) binary successfully built!"
$(RIOTTOOLS)/pic32prog/pic32prog: $(RIOTTOOLS)/pic32prog/Makefile $(RIOTTOOLS)/pic32prog/pic32prog: $(RIOTTOOLS)/pic32prog/Makefile
@echo "[INFO] $(@F) binary not found - building it from source now" @echo "[INFO] $(@F) binary not found - building it from source now"
make -C $(@D) $(MAKE) -C $(@D)
@echo "[INFO] $(@F) binary successfully built!" @echo "[INFO] $(@F) binary successfully built!"
$(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py: $(RIOTTOOLS)/cc2538-bsl/cc2538-bsl.py:
@echo "[INFO] cc2538-bsl.py not found - fetching it from GitHub now" @echo "[INFO] cc2538-bsl.py not found - fetching it from GitHub now"
CC= CFLAGS= make -C $(RIOTTOOLS)/cc2538-bsl CC= CFLAGS= $(MAKE) -C $(RIOTTOOLS)/cc2538-bsl
@echo "[INFO] cc2538-bsl.py successfully fetched!" @echo "[INFO] cc2538-bsl.py successfully fetched!"
$(RIOTTOOLS)/edbg/edbg: $(RIOTTOOLS)/edbg/Makefile $(RIOTTOOLS)/edbg/edbg: $(RIOTTOOLS)/edbg/Makefile
@echo "[INFO] edbg binary not found - building it from source now" @echo "[INFO] edbg binary not found - building it from source now"
CC= CFLAGS= make -C $(RIOTTOOLS)/edbg CC= CFLAGS= $(MAKE) -C $(RIOTTOOLS)/edbg
@echo "[INFO] edbg binary successfully built!" @echo "[INFO] edbg binary successfully built!"
$(RIOTTOOLS)/mosquitto_rsmb/mosquitto_rsmb: $(RIOTTOOLS)/mosquitto_rsmb/mosquitto_rsmb:
@echo "[INFO] rsmb binary not found - building it from source now" @echo "[INFO] rsmb binary not found - building it from source now"
@make -C $(RIOTTOOLS)/mosquitto_rsmb @$(MAKE) -C $(RIOTTOOLS)/mosquitto_rsmb
@echo "[INFO] rsmb binary successfully built!" @echo "[INFO] rsmb binary successfully built!"
mosquitto_rsmb: $(RIOTTOOLS)/mosquitto_rsmb/mosquitto_rsmb mosquitto_rsmb: $(RIOTTOOLS)/mosquitto_rsmb/mosquitto_rsmb
@make -C $(RIOTTOOLS)/mosquitto_rsmb run @$(MAKE) -C $(RIOTTOOLS)/mosquitto_rsmb run
$(RIOTTOOLS)/setsid/setsid: $(RIOTTOOLS)/setsid/Makefile $(RIOTTOOLS)/setsid/setsid: $(RIOTTOOLS)/setsid/Makefile
@echo "[INFO] setsid binary not found - building it from source now" @echo "[INFO] setsid binary not found - building it from source now"
@make -C $(RIOTTOOLS)/setsid @$(MAKE) -C $(RIOTTOOLS)/setsid
@echo "[INFO] setsid binary successfully built!" @echo "[INFO] setsid binary successfully built!"
$(RIOTTOOLS)/flatc/flatc: $(RIOTTOOLS)/flatc/Makefile $(RIOTTOOLS)/flatc/flatc: $(RIOTTOOLS)/flatc/Makefile
@echo "[INFO] flatc binary not found - building it from source now" @echo "[INFO] flatc binary not found - building it from source now"
make -C $(RIOTTOOLS)/flatc $(MAKE) -C $(RIOTTOOLS)/flatc
@echo "[INFO] flatc binary successfully built!" @echo "[INFO] flatc binary successfully built!"

2
pkg/nanopb/Makefile.gensrc
View File

@ -22,7 +22,7 @@ $(GENSRC): $(PROTOBUF_FILES)
$(Q)D=$(BINDIR)/$(MODULE) && \ $(Q)D=$(BINDIR)/$(MODULE) && \
mkdir -p "$$D" && \ mkdir -p "$$D" && \
cd $(CURDIR) && \ cd $(CURDIR) && \
make -C $(PKGDIRBASE)/nanopb/generator/proto && \ $(MAKE) -C $(PKGDIRBASE)/nanopb/generator/proto && \
for protofile in $(PROTOBUF_FILES); do \ for protofile in $(PROTOBUF_FILES); do \
protoc --plugin=protoc-gen-nanopb=$(PROTOC_GEN_NANOPB) \ protoc --plugin=protoc-gen-nanopb=$(PROTOC_GEN_NANOPB) \
--nanopb_out="$$D" $(PROTO_INCLUDES) \ --nanopb_out="$$D" $(PROTO_INCLUDES) \

2
pkg/openthread/Makefile
View File

@ -48,7 +48,7 @@ $(BINDIR)/openthread-cli.a: $(BINDIR)/openthread-$(TD).a
@cp $(OT_LIB_DIR)/libopenthread-cli-$(TD).a $@ @cp $(OT_LIB_DIR)/libopenthread-cli-$(TD).a $@
$(OT_LIB_DIR)/libopenthread-$(TD).a: $(PKG_BUILD_DIR)/Makefile $(OT_LIB_DIR)/libopenthread-$(TD).a: $(PKG_BUILD_DIR)/Makefile
make -C $(PKG_BUILD_DIR) -j4 --no-print-directory install DESTDIR=$(PKG_BUILD_DIR)/output PREFIX=/ $(MAKE) -C $(PKG_BUILD_DIR) -j4 --no-print-directory install DESTDIR=$(PKG_BUILD_DIR)/output PREFIX=/
$(Q)printf "OpenThread built for %s device\n" $(TD) $(Q)printf "OpenThread built for %s device\n" $(TD)
$(PKG_BUILD_DIR)/Makefile: $(PKG_BUILD_DIR)/configure $(PKG_BUILD_DIR)/Makefile: $(PKG_BUILD_DIR)/configure

2
tests/emcute/Makefile
View File

@ -35,6 +35,6 @@ TEST_ON_CI_BLACKLIST += all
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_dhcpv6_client/Makefile
View File

@ -46,5 +46,5 @@ ifeq (,$(filter native,$(BOARD)))
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTBASE)/dist/tools/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTBASE)/dist/tools/ethos
endif endif

2
tests/gnrc_dhcpv6_client_6lbr/Makefile
View File

@ -47,5 +47,5 @@ ifeq (,$(filter native,$(BOARD)))
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTBASE)/dist/tools/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTBASE)/dist/tools/ethos
endif endif

2
tests/gnrc_ipv6_ext/Makefile
View File

@ -35,6 +35,6 @@ TEST_ON_CI_BLACKLIST += all
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_ipv6_ext_frag/Makefile
View File

@ -47,7 +47,7 @@ SHOULD_RUN_KCONFIG ?=
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_ipv6_ext_opt/Makefile
View File

@ -34,6 +34,6 @@ TEST_ON_CI_BLACKLIST += all
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_ipv6_nib_dns/Makefile
View File

@ -44,6 +44,6 @@ TEST_ON_CI_BLACKLIST += all
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_rpl_srh/Makefile
View File

@ -39,6 +39,6 @@ TEST_ON_CI_BLACKLIST += all
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_sock_dns/Makefile
View File

@ -47,6 +47,6 @@ TEST_ON_CI_BLACKLIST += all
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include

2
tests/gnrc_tcp/Makefile
View File

@ -40,7 +40,7 @@ export TAPDEV = $(TAP)
.PHONY: ethos .PHONY: ethos
ethos: ethos:
$(Q)env -u CC -u CFLAGS make -C $(RIOTTOOLS)/ethos $(Q)env -u CC -u CFLAGS $(MAKE) -C $(RIOTTOOLS)/ethos
include $(RIOTBASE)/Makefile.include include $(RIOTBASE)/Makefile.include