From 69b3e05f01ede0972846c23af4e7dc572e943d97 Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Fri, 21 Apr 2023 09:45:45 +0200
Subject: [PATCH] sys/shell: restructure deps

Move deps on sys/shell to sys/Makefile.dep and only keep deps of
sys/shell in sys/shell/Makefile.dep
---
 sys/Makefile.dep       | 18 ++++++++++++++++--
 sys/shell/Makefile.dep | 15 +--------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/sys/Makefile.dep b/sys/Makefile.dep
index 5cb8f39945..1b65ead944 100644
--- a/sys/Makefile.dep
+++ b/sys/Makefile.dep
@@ -334,8 +334,22 @@ ifneq (,$(filter random_cmd,$(USEMODULE)))
   USEMODULE += shell_cmd_random
 endif
 
-ifneq (,$(filter shell%,$(USEMODULE)))
-  USEMODULE += stdin
+ifneq (,$(filter shell_commands,$(USEMODULE)))
+  # shell_commands has been renamed to shell_cmds_default, but let's keep this
+  # for backward compatibility
+  USEMODULE += shell_cmds_default
+endif
+
+ifneq (,$(filter shell_cmd%,$(USEMODULE)))
+  # each and every command is a submodule of shell_cmds
+  USEMODULE += shell_cmds
+endif
+
+ifneq (,$(filter shell_cmds,$(USEMODULE)))
+  USEMODULE += shell
+endif
+
+ifneq (,$(filter shell,$(USEMODULE)))
   include $(RIOTBASE)/sys/shell/Makefile.dep
 endif
 
diff --git a/sys/shell/Makefile.dep b/sys/shell/Makefile.dep
index ea24f60379..da3616e0e5 100644
--- a/sys/shell/Makefile.dep
+++ b/sys/shell/Makefile.dep
@@ -1,17 +1,4 @@
-ifneq (,$(filter shell_cmd_%,$(USEMODULE)))
-  # each and every command is a submodule of shell_cmds
-  USEMODULE += shell_cmds
-endif
-
-ifneq (,$(filter shell_cmds,$(USEMODULE)))
-  USEMODULE += shell
-endif
-
-ifneq (,$(filter shell_commands,$(USEMODULE)))
-  # shell_commands has been renamed to shell_cmds_default, but let's keep this
-  # for backward compatibility
-  USEMODULE += shell_cmds_default
-endif
+USEMODULE += stdin
 
 ifneq (,$(filter shell_cmds_default,$(USEMODULE)))
   USEMODULE += shell_cmd_sys