diff options
| author | Andrew Scheller <github@loowis.durge.org> | 2014-04-07 01:35:45 +0100 |
|---|---|---|
| committer | Andrew Scheller <github@loowis.durge.org> | 2014-04-07 01:35:45 +0100 |
| commit | 902d9552c551a14821fbf9a801eb2174fcd04dbb (patch) | |
| tree | d634b811a1798052fda3753b73c7e7ad42952ec2 /py | |
| parent | 36e75aef38b9553f852454d7013cbc0ba919ef30 (diff) | |
| download | micropython-902d9552c551a14821fbf9a801eb2174fcd04dbb.tar.gz micropython-902d9552c551a14821fbf9a801eb2174fcd04dbb.zip | |
Replace some Makefile commands with variables in py/mkenv.mk
Diffstat (limited to 'py')
| -rw-r--r-- | py/mkenv.mk | 5 | ||||
| -rw-r--r-- | py/mkrules.mk | 12 | ||||
| -rw-r--r-- | py/py.mk | 2 |
3 files changed, 12 insertions, 7 deletions
diff --git a/py/mkenv.mk b/py/mkenv.mk index ed4e22096d..8ae54f06bb 100644 --- a/py/mkenv.mk +++ b/py/mkenv.mk @@ -39,12 +39,17 @@ BUILD ?= build RM = rm ECHO = @echo +CP = cp +MKDIR = mkdir +SED = sed +PYTHON = python AS = $(CROSS_COMPILE)as CC = $(CROSS_COMPILE)gcc LD = $(CROSS_COMPILE)ld OBJCOPY = $(CROSS_COMPILE)objcopy SIZE = $(CROSS_COMPILE)size +STRIP = $(CROSS_COMPILE)strip all: .PHONY: all diff --git a/py/mkrules.mk b/py/mkrules.mk index 2730eff415..452be8cff9 100644 --- a/py/mkrules.mk +++ b/py/mkrules.mk @@ -35,10 +35,10 @@ $(ECHO) "CC $<" $(Q)$(CC) $(CFLAGS) -c -MD -o $@ $< @# The following fixes the dependency file. @# See http://make.paulandlesley.org/autodep.html for details. -@cp $(@:.o=.d) $(@:.o=.P); \ - sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ +@$(CP) $(@:.o=.d) $(@:.o=.P); \ + $(SED) -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -e '/^$$/ d' -e 's/$$/ :/' < $(@:.o=.d) >> $(@:.o=.P); \ - rm -f $(@:.o=.d) + $(RM) -f $(@:.o=.d) endef vpath %.c . $(TOP) @@ -61,7 +61,7 @@ $(BUILD)/%.pp: %.c OBJ_DIRS = $(sort $(dir $(OBJ))) $(OBJ): | $(OBJ_DIRS) $(OBJ_DIRS): - mkdir -p $@ + $(MKDIR) -p $@ ifneq ($(PROG),) # Build a standalone executable (unix and unix-cpy do this) @@ -72,9 +72,9 @@ $(PROG): $(OBJ) $(ECHO) "LINK $@" $(Q)$(CC) -o $@ $(OBJ) $(LIB) $(LDFLAGS) ifndef DEBUG - $(Q)strip $(PROG) + $(Q)$(STRIP) $(PROG) endif - $(Q)size $(PROG) + $(Q)$(SIZE) $(PROG) clean: clean-prog clean-prog: @@ -105,7 +105,7 @@ $(PY_BUILD)/py-version.h: FORCE $(PY_BUILD)/qstrdefs.generated.h: | $(PY_BUILD)/ $(PY_BUILD)/qstrdefs.generated.h: $(PY_QSTR_DEFS) $(QSTR_DEFS) $(PY_SRC)/makeqstrdata.py $(ECHO) "makeqstrdata $(PY_QSTR_DEFS) $(QSTR_DEFS)" - $(Q)python $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@ + $(Q)$(PYTHON) $(PY_SRC)/makeqstrdata.py $(PY_QSTR_DEFS) $(QSTR_DEFS) > $@ # We don't know which source files actually need the generated.h (since # it is #included from str.h). The compiler generated dependencies will cause |