cmake/zephyr: unify cmake rules for src/audio/selector

Adding all source files in a single, giant zephyr/CMakeLists.txt is
inconvenient and does not scale.

Modify Zephyr rules to use definitions in src/audio/selector instead

Link: #8260
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>

Author: kv2019i

src/audio/CMakeLists.txt

@@ -26,6 +26,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_IIR)
 		add_subdirectory(eq_iir)
 	endif()
+	if(CONFIG_COMP_SEL)
+		add_subdirectory(selector)
+	endif()
 	if(CONFIG_COMP_SRC)
 		add_subdirectory(src)
 	endif()
@@ -95,9 +98,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 			kpb.c
 		)
 	endif()
-	if(CONFIG_COMP_SEL)
-		add_subdirectory(selector)
-	endif()
 	if(CONFIG_COMP_SMART_AMP)
 		add_subdirectory(smart_amp)
 	endif()

src/audio/selector/CMakeLists.txt

@@ -1,3 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
+if(CONFIG_COMP_SEL STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/selector_llext)
+  add_dependencies(app selector)
+  return()
+endif()
+
 add_local_sources(sof selector_generic.c selector.c)

zephyr/CMakeLists.txt

@@ -506,17 +506,6 @@ elseif(CONFIG_IPC_MAJOR_4)
 set(ipc_suffix ipc4)
 endif()
 
-if(CONFIG_COMP_SEL STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/selector/llext
-			 ${PROJECT_BINARY_DIR}/selector_llext)
-	add_dependencies(app selector)
-elseif(CONFIG_COMP_SEL)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/selector/selector_generic.c
-		${SOF_AUDIO_PATH}/selector/selector.c
-	)
-endif()
-
 zephyr_library_sources_ifdef(CONFIG_COMP_KPB
 	${SOF_AUDIO_PATH}/kpb.c
 )