From 0610011db26eac20807d912c1c8f47921fefca29 Mon Sep 17 00:00:00 2001 From: Francisco Molina Date: Thu, 25 Jun 2020 09:34:11 +0200 Subject: [PATCH] sys/arduino: include arduino_sketches in Makefile.dep --- sys/Makefile.dep | 2 ++ sys/arduino/Makefile.include | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/Makefile.dep b/sys/Makefile.dep index c5f1fb13a04c0..242f40b1d99d2 100644 --- a/sys/Makefile.dep +++ b/sys/Makefile.dep @@ -2,6 +2,8 @@ ifneq (,$(filter arduino,$(USEMODULE))) FEATURES_OPTIONAL += periph_i2c FEATURES_OPTIONAL += periph_spi FEATURES_REQUIRED += periph_uart + SKETCH_MODULE ?= arduino_sketches + USEMODULE += $(SKETCH_MODULE) endif ifneq (,$(filter eepreg,$(USEMODULE))) diff --git a/sys/arduino/Makefile.include b/sys/arduino/Makefile.include index 6549d6c396508..16e404ff14ce4 100644 --- a/sys/arduino/Makefile.include +++ b/sys/arduino/Makefile.include @@ -4,14 +4,16 @@ SKETCHES = $(wildcard $(APPDIR)/*.sketch) ifneq (,$(SKETCHES)) # Define application sketches module, it will be generated into $(BINDIR) - SKETCH_MODULE ?= arduino_sketches SKETCH_MODULE_DIR ?= $(BINDIR)/$(SKETCH_MODULE) include $(RIOTBASE)/sys/arduino/sketches.inc.mk # Depends on module - USEMODULE += $(SKETCH_MODULE) DIRS += $(SKETCH_MODULE_DIR) BUILDDEPS += $(SKETCH_GENERATED_FILES) +else + # arduino_sketches is now always included if arduino is, but if there + # are no sketches then no %.a will be present, so declare PSEUDOMODULE + PSEUDOMODULES += $(SKETCH_MODULE) endif # include the Arduino headers