lib: update libfx

lib/CMakeLists.txt

@@ -1,6 +1,6 @@
 file(GLOB items *)
 
-set(fx_modules core ds serial)
+set(fx_assemblies fx.runtime fx.collections fx.serial)
 set(fx_enable_floating_point 0)
 set(fx_enable_tests 0)
 
@@ -29,21 +29,20 @@ foreach(item ${items})
 	add_subdirectory(${item})
 endforeach (item)
 
-foreach (module ${fx_modules})
-	target_link_libraries(fx-${module} libc libpthread)
-	target_link_libraries(fx-${module}-s libc-core libc-pthread libmagenta)
-	target_link_options(fx-${module} PRIVATE -Wl,--soname,libfx-${module}.so)
+foreach (assembly ${fx_assemblies})
+	target_link_libraries(${assembly} libc libpthread)
+	target_link_options(${assembly} PRIVATE -Wl,--soname,lib${assembly}.so)
 	rosetta_wrap_library(
-		NAME fx-${module}
+		NAME ${assembly}
 		PUBLIC_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/libfx/${module}/include)
-	set_target_properties(fx-${module} fx-${module}-s PROPERTIES
+	set_target_properties(${assembly} PROPERTIES
 		PREFIX "lib")
 	sysroot_add_library(
-		NAME fx-${module}
+		NAME ${assembly}
 		HEADER_DIR /usr/include
 		LIB_DIR /usr/lib)
 	bsp_add_library(
-		NAME fx-${module}
+		NAME ${assembly}
 		LIB_DIR /usr/lib)
-endforeach (module)
+endforeach (assembly)