From 1c57e7355dcaa79eee5b1601ed7e3b43281436d2 Mon Sep 17 00:00:00 2001 From: Alexandre Abadie Date: Fri, 21 Apr 2023 09:56:28 +0200 Subject: [PATCH] sys/senml: cleanup dependency resolution --- sys/Makefile.dep | 4 ++-- sys/senml/Makefile.dep | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/Makefile.dep b/sys/Makefile.dep index 258b352746..b65283db01 100644 --- a/sys/Makefile.dep +++ b/sys/Makefile.dep @@ -385,8 +385,8 @@ ifneq (,$(filter saul_default,$(USEMODULE))) USEMODULE += saul_reg endif -ifneq (,$(filter senml%,$(USEMODULE))) - include $(RIOTBASE)/sys/senml/Makefile.dep +ifneq (,$(filter senml_%,$(USEMODULE))) + USEMODULE += senml endif ifneq (,$(filter phydat,$(USEMODULE))) diff --git a/sys/senml/Makefile.dep b/sys/senml/Makefile.dep index b7766e0464..175f112805 100644 --- a/sys/senml/Makefile.dep +++ b/sys/senml/Makefile.dep @@ -1,5 +1,4 @@ ifneq (,$(filter senml_saul,$(USEMODULE))) - USEMODULE += senml USEMODULE += senml_cbor USEMODULE += senml_phydat USEMODULE += saul_reg @@ -7,10 +6,8 @@ endif ifneq (,$(filter senml_cbor,$(USEMODULE))) USEPKG += nanocbor - USEMODULE += senml endif ifneq (,$(filter senml_phydat,$(USEMODULE))) - USEMODULE += senml USEMODULE += phydat endif