From adcc67cd6115efef07291bd071c55542bca9ef54 Mon Sep 17 00:00:00 2001 From: Daniel Thompson Date: Tue, 23 Jun 2020 09:43:58 +0100 Subject: [PATCH] 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 --- Makefile | 5 +++-- 1 file 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