Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
TASTE
uPython-mirror
Commits
8ae885a0
Commit
8ae885a0
authored
Sep 17, 2016
by
Paul Sokolovsky
Browse files
esp8266/Makefile: Rename SCRIPTDIR to FROZEN_DIR for consistency.
With FROZEN_MPY_DIR.
parent
ee324c50
Changes
1
Hide whitespace changes
Inline
Side-by-side
esp8266/Makefile
View file @
8ae885a0
...
...
@@ -14,7 +14,7 @@ MPY_CROSS = ../mpy-cross/mpy-cross
MPY_TOOL
=
../tools/mpy-tool.py
MAKE_FROZEN
=
../tools/make-frozen.py
SCRIPT
DIR
=
scripts
FROZEN_
DIR
=
scripts
FROZEN_MPY_DIR
=
modules
PORT
?=
/dev/ttyACM0
BAUD
?=
115200
...
...
@@ -164,16 +164,16 @@ CONFVARS_FILE = $(BUILD)/confvars
ifeq
($(wildcard $(CONFVARS_FILE)),)
$(shell
$(MKDIR)
-p
$(BUILD))
$(shell
echo
$(
SCRIPT
DIR)
$(UART_OS)
>
$(CONFVARS_FILE))
else
ifneq
($(shell cat $(CONFVARS_FILE)), $(
SCRIPT
DIR) $(UART_OS))
$(shell
echo
$(
SCRIPT
DIR)
$(UART_OS)
>
$(CONFVARS_FILE))
$(shell
echo
$(
FROZEN_
DIR)
$(UART_OS)
>
$(CONFVARS_FILE))
else
ifneq
($(shell cat $(CONFVARS_FILE)), $(
FROZEN_
DIR) $(UART_OS))
$(shell
echo
$(
FROZEN_
DIR)
$(UART_OS)
>
$(CONFVARS_FILE))
endif
$(BUILD)/uart.o
:
$(CONFVARS_FILE)
$(BUILD)/frozen.c
:
$(wildcard $(
SCRIPT
DIR)/*) $(CONFVARS_FILE)
$(BUILD)/frozen.c
:
$(wildcard $(
FROZEN_
DIR)/*) $(CONFVARS_FILE)
$(ECHO)
"Generating
$@
"
$(Q)$(MAKE_FROZEN)
$(
SCRIPT
DIR)
>
$@
$(Q)$(MAKE_FROZEN)
$(
FROZEN_
DIR)
>
$@
# to build .mpy files from .py files
$(BUILD)/$(FROZEN_MPY_DIR)/%.mpy
:
$(FROZEN_MPY_DIR)/%.py
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment