Skip to content

Commit 902d955

Browse files
lurchlurch
committed
Replace some Makefile commands with variables in py/mkenv.mk
1 parent 36e75ae commit 902d955

5 files changed

Lines changed: 16 additions & 11 deletions

File tree

‎py/mkenv.mk‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,17 @@ BUILD ?= build
3939

4040
RM = rm
4141
ECHO = @echo
42+
CP = cp
43+
MKDIR = mkdir
44+
SED = sed
45+
PYTHON = python
4246

4347
AS = $(CROSS_COMPILE)as
4448
CC = $(CROSS_COMPILE)gcc
4549
LD = $(CROSS_COMPILE)ld
4650
OBJCOPY = $(CROSS_COMPILE)objcopy
4751
SIZE = $(CROSS_COMPILE)size
52+
STRIP = $(CROSS_COMPILE)strip
4853

4954
all:
5055
.PHONY: all

‎py/mkrules.mk‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ $(ECHO) "CC $<"
3535
$(Q)$(CC) $(CFLAGS) -c -MD -o $@ $<
3636
@# The following fixes the dependency file.
3737
@# See http://make.paulandlesley.org/autodep.html for details.
38-
@cp $(@:.o=.d) $(@:.o=.P); \
39-
sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
38+
@$(CP) $(@:.o=.d) $(@:.o=.P); \
39+
$(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
4040
-e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \
41-
rm -f $(@:.o=.d)
41+
$(RM) -f $(@:.o=.d)
4242
endef
4343

4444
vpath %.c . $(TOP)
@@ -61,7 +61,7 @@ $(BUILD)/%.pp: %.c
6161
OBJ_DIRS = $(sort $(dir $(OBJ)))
6262
$(OBJ): | $(OBJ_DIRS)
6363
$(OBJ_DIRS):
64-
mkdir -p $@
64+
$(MKDIR) -p $@
6565

6666
ifneq ($(PROG),)
6767
# Build a standalone executable (unix and unix-cpy do this)
@@ -72,9 +72,9 @@ $(PROG): $(OBJ)
7272
$(ECHO) "LINK $@"
7373
$(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS)
7474
ifndef DEBUG
75-
$(Q)strip $(PROG)
75+
$(Q)$(STRIP) $(PROG)
7676
endif
77-
$(Q)size $(PROG)
77+
$(Q)$(SIZE) $(PROG)
7878

7979
clean: clean-prog
8080
clean-prog:

‎py/py.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ $(PY_BUILD)/py-version.h: FORCE
105105
$(PY_BUILD)/qstrdefs.generated.h: | $(PY_BUILD)/
106106
$(PY_BUILD)/qstrdefs.generated.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(PY_SRC)/makeqstrdata.py
107107
$(ECHO) "makeqstrdata $(PY_QSTR_DEFS) $(QSTR_DEFS)"
108-
$(Q)python $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@
108+
$(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@
109109

110110
# We don't know which source files actually need the generated.h (since
111111
# it is #included from str.h). The compiler generated dependencies will cause

‎stm/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ all: $(BUILD)/flash.dfu
174174

175175
$(BUILD)/flash.dfu: $(BUILD)/flash0.bin $(BUILD)/flash1.bin
176176
$(ECHO) "Create $@"
177-
$(Q)python $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@
177+
$(Q)$(PYTHON) $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@
178178

179179
$(BUILD)/flash0.bin: $(BUILD)/flash.elf
180180
$(Q)$(OBJCOPY) -O binary -j .isr_vector $^ $@
@@ -205,7 +205,7 @@ $(OBJ): | $(BUILD)/pins.h
205205
# both pins_$(BOARD).c and pins.h
206206
$(BUILD)/%_$(BOARD).c $(BUILD)/%.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE)
207207
$(ECHO) "Create $@"
208-
$(Q)python $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
208+
$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
209209

210210
$(BUILD)/pins_$(BOARD).o: $(BUILD)/pins_$(BOARD).c
211211
$(call compile_c)

‎stmhal/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ all: $(BUILD)/flash.dfu
189189

190190
$(BUILD)/flash.dfu: $(BUILD)/flash0.bin $(BUILD)/flash1.bin
191191
$(ECHO) "Create $@"
192-
$(Q)python $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@
192+
$(Q)$(PYTHON) $(DFU) -b 0x08000000:$(BUILD)/flash0.bin -b 0x08020000:$(BUILD)/flash1.bin $@
193193

194194
$(BUILD)/flash0.bin: $(BUILD)/flash.elf
195195
$(Q)$(OBJCOPY) -O binary -j .isr_vector $^ $@
@@ -220,7 +220,7 @@ $(OBJ): | $(BUILD)/pins.h
220220
# both pins_$(BOARD).c and pins.h
221221
$(BUILD)/%_$(BOARD).c $(BUILD)/%.h: boards/$(BOARD)/%.csv $(MAKE_PINS) $(AF_FILE) $(PREFIX_FILE)
222222
$(ECHO) "Create $@"
223-
$(Q)python $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
223+
$(Q)$(PYTHON) $(MAKE_PINS) --board $(BOARD_PINS) --af $(AF_FILE) --prefix $(PREFIX_FILE) --hdr $(GEN_PINS_HDR) > $(GEN_PINS_SRC)
224224

225225
$(BUILD)/pins_$(BOARD).o: $(BUILD)/pins_$(BOARD).c
226226
$(call compile_c)

0 commit comments

Comments
 (0)