pinetime/wasp-os
1
0
Fork 0
Code Activity

Makefile: Fix builds when watch.py must be regenerated

Browse source 
The paths passed to the preprocessor are currently wrong. Fix them!

Fixes: 64afca1 ("Makefile: fix make sim (allow BOARD to be unset)")
Signed-off-by: Daniel Thompson <daniel@redfelineninja.org.uk>
This commit is contained in:
Daniel Thompson 2020-06-23 09:43:58 +01:00
parent 88418fd1b5
commit adcc67cd61
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -5,7 +5,7 @@ all : bootloader reloader micropython
ifdef BOARD ifdef BOARD
WASP_WATCH_PY = wasp/boards/$(BOARD)/watch.py WASP_WATCH_PY = wasp/boards/$(BOARD)/watch.py
$(WASP_WATCH_PY) : $(WASP_WATCH_PY).in $(WASP_WATCH_PY) : $(WASP_WATCH_PY).in
(cd wasp; ../tools/preprocess.py $(WASP_WATCH_PY).in $(WASP_WATCH_PY)) (cd wasp; ../tools/preprocess.py ../$(WASP_WATCH_PY).in > ../$(WASP_WATCH_PY))
else else
BOARD ?= $(error Please set BOARD=) BOARD ?= $(error Please set BOARD=)
endif endif
@ -15,7 +15,8 @@ clean :
bootloader/_build-$(BOARD)_nrf52832 \ bootloader/_build-$(BOARD)_nrf52832 \
reloader/build-$(BOARD) reloader/src/boards/$(BOARD)/bootloader.h \ reloader/build-$(BOARD) reloader/src/boards/$(BOARD)/bootloader.h \
micropython/mpy-cross/build \ micropython/mpy-cross/build \
micropython/ports/nrf/build-$(BOARD)-s132 micropython/ports/nrf/build-$(BOARD)-s132 \
$(WASP_WATCH_PY)
submodules : submodules :
git submodule update --init --recursive git submodule update --init --recursive