py/py.mk: Automatically add frozen.c to source list if FROZEN_DIR is defined.

Now frozen modules generation handled fully by py.mk and available for reuse
by any port.
pull/2518/merge
Paul Sokolovsky 2016-10-21 01:08:43 +03:00
rodzic 3f251efb9b
commit b440307b4a
3 zmienionych plików z 7 dodań i 4 usunięć

Wyświetl plik

@ -7,14 +7,15 @@ MICROPY_PY_USSL = 1
MICROPY_SSL_AXTLS = 1
MICROPY_PY_BTREE = 1
FROZEN_DIR = scripts
FROZEN_MPY_DIR = modules
# include py core make definitions
include ../py/py.mk
MPY_CROSS = ../mpy-cross/mpy-cross
MPY_TOOL = ../tools/mpy-tool.py
FROZEN_DIR = scripts
FROZEN_MPY_DIR = modules
PORT ?= /dev/ttyACM0
BAUD ?= 115200
FLASH_MODE ?= qio
@ -90,7 +91,6 @@ SRC_C = \
modmachine.c \
modonewire.c \
ets_alt_task.c \
$(BUILD)/frozen.c \
fatfs_port.c \
axtls_helpers.c \
hspi.c \

Wyświetl plik

@ -237,6 +237,10 @@ PY_O_BASENAME = \
# prepend the build destination prefix to the py object files
PY_O = $(addprefix $(PY_BUILD)/, $(PY_O_BASENAME))
ifneq ($(FROZEN_DIR),)
PY_O += $(BUILD)/$(BUILD)/frozen.o
endif
# Sources that may contain qstrings
SRC_QSTR_IGNORE = nlr% emitnx% emitnthumb% emitnarm%
SRC_QSTR = $(SRC_MOD) $(addprefix py/,$(filter-out $(SRC_QSTR_IGNORE),$(PY_O_BASENAME:.o=.c)) emitnative.c)

Wyświetl plik

@ -41,7 +41,6 @@ SRC_C = main.c \
lib/utils/interrupt_char.c \
lib/utils/pyhelp.c \
lib/mp-readline/readline.c \
$(BUILD)/frozen.c \
$(SRC_MOD)
# List of sources for qstr extraction