ooopathutils_hack linked_libs -> ooopathutils linked_static_libs

desktop/Executable_guiloader.mk

@@ -34,8 +34,8 @@ $(eval $(call gb_Executable_set_include,guiloader,\
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,guiloader,\
-    ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,guiloader,\
+    ooopathutils \
 ))
 
 $(eval $(call gb_Executable_add_noexception_objects,guiloader,\

desktop/Executable_officeloader.mk

@@ -63,8 +63,8 @@ endif
 
 ifeq ($(GUI),WNT)
 
-$(eval $(call gb_Executable_add_linked_libs,officeloader,\
-    ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,officeloader,\
+    ooopathutils \
 ))
 
 $(eval $(call gb_Executable_add_noexception_objects,officeloader,\

desktop/Executable_soffice.mk

@@ -44,8 +44,8 @@ $(eval $(call gb_Executable_add_cobjects,soffice,\
     desktop/source/app/main.c \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,soffice,\
-    ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,soffice,\
+    ooopathutils \
 ))
 
 ifeq ($(COM),MSC)

desktop/Executable_unoinfo.mk

@@ -32,8 +32,8 @@ $(eval $(call gb_Executable_set_include,unoinfo,\
     -I$(SRCDIR)/desktop/inc/pch \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,unoinfo,\
-    ooopathutils_hack \
+$(eval $(call gb_Executable_add_linked_static_libs,unoinfo,\
+    ooopathutils \
 ))
 
 $(eval $(call gb_Executable_add_noexception_objects,unoinfo,\