From b9fa2b5bf675aadcbd6393727cede2142ddd126c Mon Sep 17 00:00:00 2001 From: Juan Carrano <j.carrano@fu-berlin.de> Date: Thu, 22 Nov 2018 16:29:47 +0100 Subject: [PATCH] examples/lua_basic: Correctly declare dependency on script files. Custom targets should be added to BUILDDEPS. Without this patch `make -j clean all" fails because of weird race condition (trying to clean while building is kind of contradictory anyways.) --- examples/lua_basic/Makefile | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/lua_basic/Makefile b/examples/lua_basic/Makefile index 21793cae59..212c31f99a 100644 --- a/examples/lua_basic/Makefile +++ b/examples/lua_basic/Makefile @@ -36,13 +36,7 @@ endif USEPKG += lua -include $(RIOTBASE)/Makefile.include - -# The code below generates a header file from any .lua scripts in the -# example directory. The header file contains a byte array of the -# ASCII characters in the .lua script. - -LUA_PATH := $(BINDIR)/lua +LUA_PATH = $(BINDIR)/lua # add directory of generated *.lua.h files to include path CFLAGS += -I$(LUA_PATH) @@ -50,14 +44,20 @@ CFLAGS += -I$(LUA_PATH) # generate .lua.h header files of .lua files LUA = $(wildcard *.lua) -LUA_H := $(LUA:%.lua=$(LUA_PATH)/%.lua.h) +LUA_H = $(LUA:%.lua=$(LUA_PATH)/%.lua.h) -$(LUA_PATH)/: - @mkdir -p $@ +BUILDDEPS += $(LUA_H) $(LUA_PATH)/ -$(LUA_H): | $(LUA_PATH)/ -$(LUA_H): $(LUA_PATH)/%.lua.h: %.lua +include $(RIOTBASE)/Makefile.include + +# The code below generates a header file from any .lua scripts in the +# example directory. The header file contains a byte array of the +# ASCII characters in the .lua script. - xxd -i $< | sed 's/^unsigned/const unsigned/g' > $@ +$(LUA_PATH)/: + $(Q)mkdir -p $@ -$(RIOTBUILD_CONFIG_HEADER_C): $(LUA_H) +# FIXME: This way of embedding lua code is not robust. A proper script will +# be included later. +$(LUA_H): $(LUA_PATH)/%.lua.h: %.lua | $(LUA_PATH)/ + $(Q)xxd -i $< | sed 's/^unsigned/const unsigned/g' > $@ -- GitLab