summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-10-16 10:48:42 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-10-16 10:49:36 +0300
commit799ccdc7892a036bf7d1e3c378f3abaa3ef9fee3 (patch)
tree5bba6703c80d572d8bc2e9a938df145624752811
parent06234a6115096a80f1a20d97a56c53766a9b8239 (diff)
esp8266, stmhal, unix: MAKE_FROZEN is consistently defined in mkenv.mk.
-rw-r--r--esp8266/Makefile1
-rw-r--r--stmhal/Makefile1
-rw-r--r--unix/Makefile2
3 files changed, 1 insertions, 3 deletions
diff --git a/esp8266/Makefile b/esp8266/Makefile
index d86fec180..65a513afd 100644
--- a/esp8266/Makefile
+++ b/esp8266/Makefile
@@ -12,7 +12,6 @@ include ../py/py.mk
MPY_CROSS = ../mpy-cross/mpy-cross
MPY_TOOL = ../tools/mpy-tool.py
-MAKE_FROZEN = ../tools/make-frozen.py
FROZEN_DIR = scripts
FROZEN_MPY_DIR = modules
diff --git a/stmhal/Makefile b/stmhal/Makefile
index 7be0f28fe..06be7acc8 100644
--- a/stmhal/Makefile
+++ b/stmhal/Makefile
@@ -276,7 +276,6 @@ all: $(BUILD)/firmware.dfu $(BUILD)/firmware.hex
ifneq ($(FROZEN_DIR),)
CFLAGS += -DMICROPY_MODULE_FROZEN_STR
OBJ += $(BUILD)/frozen-files.o
-MAKE_FROZEN = ../tools/make-frozen.py
$(BUILD)/frozen-files.o: $(BUILD)/frozen-files.c
$(call compile_c)
diff --git a/unix/Makefile b/unix/Makefile
index 4a313b3a8..53ff4cb48 100644
--- a/unix/Makefile
+++ b/unix/Makefile
@@ -273,7 +273,7 @@ coverage_test: coverage
gcov -o build-coverage/extmod ../extmod/*.c
$(BUILD)/_frozen_upip.c: $(BUILD)/frozen_upip/upip.py
- ../tools/make-frozen.py $(dir $^) > $@
+ $(MAKE_FROZEN) $(dir $^) > $@
# Select latest upip version available
UPIP_TARBALL := $(shell ls -1 -v ../tools/micropython-upip-*.tar.gz | tail -n1)