summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDaniel Thompson <daniel@redfelineninja.org.uk>2020-06-23 08:43:58 (GMT)
committerDaniel Thompson <daniel@redfelineninja.org.uk>2020-06-23 08:43:58 (GMT)
commitadcc67cd6115efef07291bd071c55542bca9ef54 (patch)
tree632f6336aa73ece0490c457b7556ae610d82589f /Makefile
parent88418fd1b50200642f68bd04a48f2e4094b289f7 (diff)
Makefile: Fix builds when watch.py must be regenerated
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>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 729f13d..6fc025b 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ all : bootloader reloader micropython
ifdef BOARD
WASP_WATCH_PY = wasp/boards/$(BOARD)/watch.py
$(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
BOARD ?= $(error Please set BOARD=)
endif
@@ -15,7 +15,8 @@ clean :
bootloader/_build-$(BOARD)_nrf52832 \
reloader/build-$(BOARD) reloader/src/boards/$(BOARD)/bootloader.h \
micropython/mpy-cross/build \
- micropython/ports/nrf/build-$(BOARD)-s132
+ micropython/ports/nrf/build-$(BOARD)-s132 \
+ $(WASP_WATCH_PY)
submodules :
git submodule update --init --recursive