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

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/rtnr
instead.

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

Author: kv2019i

src/audio/CMakeLists.txt

@@ -75,6 +75,9 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 	if(CONFIG_COMP_MUX)
 		add_subdirectory(mux)
 	endif()
+	if(CONFIG_COMP_RTNR)
+		add_subdirectory(rtnr)
+	endif()
 	if(CONFIG_COMP_SEL)
 		add_subdirectory(selector)
 	endif()
@@ -140,9 +143,6 @@ if(NOT CONFIG_COMP_MODULE_SHARED_LIBRARY_BUILD)
 			dai-legacy.c
 		)
 	endif()
-	if(CONFIG_COMP_RTNR)
-		add_subdirectory(rtnr)
-	endif()
 	if(CONFIG_INTEL_ADSP_MIC_PRIVACY)
 		add_subdirectory(mic_privacy_manager)
 	endif()

src/audio/rtnr/CMakeLists.txt

@@ -1,11 +1,26 @@
 # SPDX-License-Identifier: BSD-3-Clause
 
-add_local_sources(sof rtnr.c)
-
-if (CONFIG_COMP_RTNR_STUB)
-	add_local_sources(sof rtnr_stub.c)
-elseif(CONFIG_TIGERLAKE)
-	add_subdirectory(rtklib/tgl)
-elseif(CONFIG_MT8195)
-	add_subdirectory(rtklib/mt8195)
+if(CONFIG_COMP_RTNR STREQUAL "m")
+  add_subdirectory(llext ${PROJECT_BINARY_DIR}/rtnr_llext)
+  add_dependencies(app rtnr)
+  return()
+endif()
+
+is_zephyr(zephyr)
+if(zephyr) ###  Zephyr ###
+
+  zephyr_library_sources(rtnr.c)
+  zephyr_library_sources_ifdef(CONFIG_COMP_RTNR_STUB rtnr_stub.c)
+
+else() ### XTOS ###
+
+  add_local_sources(sof rtnr.c)
+  if (CONFIG_COMP_RTNR_STUB)
+    add_local_sources(sof rtnr_stub.c)
+  elseif(CONFIG_TIGERLAKE)
+    add_subdirectory(rtklib/tgl)
+  elseif(CONFIG_MT8195)
+    add_subdirectory(rtklib/mt8195)
+  endif()
+
 endif()

zephyr/CMakeLists.txt

@@ -524,20 +524,6 @@ zephyr_library_sources_ifdef(CONFIG_LIBRARY_MANAGER
 )
 endif()
 
-if(CONFIG_COMP_RTNR STREQUAL "m")
-	add_subdirectory(${SOF_AUDIO_PATH}/rtnr/llext
-			 ${PROJECT_BINARY_DIR}/rtnr_llext)
-	add_dependencies(app rtnr)
-elseif(CONFIG_COMP_RTNR)
-	zephyr_library_sources(
-		${SOF_AUDIO_PATH}/rtnr/rtnr.c
-	)
-
-	zephyr_library_sources_ifdef(CONFIG_COMP_RTNR_STUB
-		${SOF_AUDIO_PATH}/rtnr/rtnr_stub.c
-	)
-endif()
-
 if(CONFIG_SAMPLE_SMART_AMP STREQUAL "m")
 	add_subdirectory(${SOF_SAMPLES_PATH}/audio/smart_amp_test_llext
 			 ${PROJECT_BINARY_DIR}/smart_amp_test_llext)