From 799ccdc7892a036bf7d1e3c378f3abaa3ef9fee3 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sun, 16 Oct 2016 10:48:42 +0300 Subject: [PATCH] esp8266, stmhal, unix: MAKE_FROZEN is consistently defined in mkenv.mk. --- esp8266/Makefile | 1 - stmhal/Makefile | 1 - unix/Makefile | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/esp8266/Makefile b/esp8266/Makefile index d86fec1808..65a513afd6 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 7be0f28fe1..06be7acc89 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 4a313b3a80..53ff4cb487 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)