sys/arduino: include arduino_sketches in Makefile.dep

RIOT-OS · Jun 25, 2020 · 0610011 · 0610011
1 parent 14f2393
commit 0610011
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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