From 3367840fa2487e567d200651d17230869e9d516c Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Wed, 29 Nov 2017 14:06:28 +0100
Subject: [PATCH] sys/net/nanocoap: use submodules
---
Makefile.dep | 8 ++++++--
makefiles/pseudomodules.inc.mk | 1 +
sys/net/application_layer/nanocoap/Makefile | 2 ++
.../nanocoap/{nanocoap_sock.c => sock.c} | 0
4 files changed, 9 insertions(+), 2 deletions(-)
rename sys/net/application_layer/nanocoap/{nanocoap_sock.c => sock.c} (100%)
diff --git a/Makefile.dep b/Makefile.dep
index dfb131a79f..a8c5177afd 100644
--- a/Makefile.dep
+++ b/Makefile.dep
@@ -652,14 +652,18 @@ ifneq (,$(filter l2filter_%,$(USEMODULE)))
endif
ifneq (,$(filter gcoap,$(USEMODULE)))
-USEMODULE += nanocoap
-USEMODULE += gnrc_sock_udp
+ USEMODULE += nanocoap
+ USEMODULE += gnrc_sock_udp
endif
ifneq (,$(filter luid,$(USEMODULE)))
FEATURES_OPTIONAL += periph_cpuid
endif
+ifneq (,$(filter nanocoap_%,$(USEMODULE)))
+ USEMODULE += nanocoap
+endif
+
# always select gpio (until explicit dependencies are sorted out)
FEATURES_OPTIONAL += periph_gpio
diff --git a/makefiles/pseudomodules.inc.mk b/makefiles/pseudomodules.inc.mk
index 9bf81c929c..1b499d1192 100644
--- a/makefiles/pseudomodules.inc.mk
+++ b/makefiles/pseudomodules.inc.mk
@@ -46,6 +46,7 @@ PSEUDOMODULES += lwip_tcp
PSEUDOMODULES += lwip_udp
PSEUDOMODULES += lwip_udplite
PSEUDOMODULES += mpu_stack_guard
+PSEUDOMODULES += nanocoap_%
PSEUDOMODULES += netdev_default
PSEUDOMODULES += netif
PSEUDOMODULES += netstats
diff --git a/sys/net/application_layer/nanocoap/Makefile b/sys/net/application_layer/nanocoap/Makefile
index 48422e909a..ff222a69b5 100644
--- a/sys/net/application_layer/nanocoap/Makefile
+++ b/sys/net/application_layer/nanocoap/Makefile
@@ -1 +1,3 @@
+SRC := nanocoap.c
+SUBMODULES := 1
include $(RIOTBASE)/Makefile.base
diff --git a/sys/net/application_layer/nanocoap/nanocoap_sock.c b/sys/net/application_layer/nanocoap/sock.c
similarity index 100%
rename from sys/net/application_layer/nanocoap/nanocoap_sock.c
rename to sys/net/application_layer/nanocoap/sock.c
--
GitLab