make WinResTarget's name independent of LinkTarget

13 files changed, 23 insertions, 23 deletions

diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 593ef1f09d0b..3259cc119fe9 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -60,6 +60,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\
     desktop/win32/source/QuickStart/QuickStart \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,quickstart,src))
+$(eval $(call gb_Executable_add_nativeres,quickstart,quickstart/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index d5e0991862ad..14e648705168 100644
--- a/desktop/Executable_sbase.mk
+++ b/desktop/Executable_sbase.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sbase,\
     desktop/win32/source/applauncher/sbase \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,sbase,src))
+$(eval $(call gb_Executable_add_nativeres,sbase,sbase/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index 550add6772b6..401e557e298e 100644
--- a/desktop/Executable_scalc.mk
+++ b/desktop/Executable_scalc.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,scalc,\
     desktop/win32/source/applauncher/scalc \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,scalc,src))
+$(eval $(call gb_Executable_add_nativeres,scalc,scalc/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 29fb38706216..e8296e74501c 100644
--- a/desktop/Executable_sdraw.mk
+++ b/desktop/Executable_sdraw.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
     desktop/win32/source/applauncher/sdraw \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,sdraw,src))
+$(eval $(call gb_Executable_add_nativeres,sdraw,sdraw/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 281718c2e65b..1b649d8d7276 100644
--- a/desktop/Executable_simpress.mk
+++ b/desktop/Executable_simpress.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,simpress,\
     desktop/win32/source/applauncher/simpress \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,simpress,src))
+$(eval $(call gb_Executable_add_nativeres,simpress,simpress/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index e8de1007d910..365c435fae52 100644
--- a/desktop/Executable_smath.mk
+++ b/desktop/Executable_smath.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,smath,\
     desktop/win32/source/applauncher/smath \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,smath,src))
+$(eval $(call gb_Executable_add_nativeres,smath,smath/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index cf142d6ea97b..aebdc1264d25 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -50,6 +50,6 @@ $(eval $(call gb_Executable_add_noexception_objects,soffice,\
     desktop/win32/source/officeloader/officeloader \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,soffice,src))
+$(eval $(call gb_Executable_add_nativeres,soffice,soffice/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index 67daa625a566..cd88fb99e87b 100644
--- a/desktop/Executable_sweb.mk
+++ b/desktop/Executable_sweb.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sweb,\
     desktop/win32/source/applauncher/sweb \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,sweb,src))
+$(eval $(call gb_Executable_add_nativeres,sweb,sweb/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index d38ea6ef6583..2c18e264eb2e 100644
--- a/desktop/Executable_swriter.mk
+++ b/desktop/Executable_swriter.mk
@@ -43,6 +43,6 @@ $(eval $(call gb_Executable_add_noexception_objects,swriter,\
     desktop/win32/source/applauncher/swriter \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,swriter,src))
+$(eval $(call gb_Executable_add_nativeres,swriter,swriter/src))
 
 # vim: set ts=4 sw=4 et:
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index a3bcc8dd4bdd..baa8d9e8bd91 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -60,7 +60,7 @@ $$(eval $$(call gb_Output_error,Library $(1) must be registered in Repository.mk
 endif
 $(call gb_Library_get_target,$(1)) : AUXTARGETS :=
 $(call gb_Library__Library_impl,$(1),$(call gb_Library_get_linktargetname,$(1)))
-$(call gb_Library_add_default_nativeres,$(1),default)
+$(call gb_Library_add_default_nativeres,$(1),$(1)/default)
 
 endef
 
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/windows.mk
index e91d5b0ecb43..e2ba1a4bce74 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@ -518,22 +518,22 @@ $(call gb_LinkTarget_get_headers_target,$(2)) : PDBFILE = $(call gb_LinkTarget_g
 endef
 
 define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+$(call gb_WinResTarget_WinResTarget_init,$(2))
+$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(2),\
 		$$(DEFS) \
 		-DADDITIONAL_VERINFO1 \
 		-DADDITIONAL_VERINFO2 \
 		-DADDITIONAL_VERINFO3 \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
 
 endef
 
 define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))
 
 endef
 
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/winmingw.mk
index ceb91d24a66c..50a5a7e08489 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/winmingw.mk
@@ -519,22 +519,22 @@ $(call gb_Deliver_add_deliverable,$(OUTDIR)/bin/$(notdir $(3)),$(3),$(1))
 endef
 
 define gb_Library_add_default_nativeres
-$(call gb_WinResTarget_WinResTarget_init,$(1)/$(2))
-$(call gb_WinResTarget_add_file,$(1)/$(2),solenv/inc/shlinfo)
-$(call gb_WinResTarget_set_defs,$(1)/$(2),\
+$(call gb_WinResTarget_WinResTarget_init,$(2))
+$(call gb_WinResTarget_add_file,$(2),solenv/inc/shlinfo)
+$(call gb_WinResTarget_set_defs,$(2),\
 		$$(DEFS) \
 		-DADDITIONAL_VERINFO1 \
 		-DADDITIONAL_VERINFO2 \
 		-DADDITIONAL_VERINFO3 \
 )
 $(call gb_Library_add_nativeres,$(1),$(2))
-$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(1)/$(2))
+$(call gb_Library_get_clean_target,$(1)) : $(call gb_WinResTarget_get_clean_target,$(2))
 
 endef
 
 define gb_LinkTarget_add_nativeres
-$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(1)/$(2))
-$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(1)/$(2))
+$(call gb_LinkTarget_get_target,$(1)) : $(call gb_WinResTarget_get_target,$(2))
+$(call gb_LinkTarget_get_target,$(1)) : NATIVERES += $(call gb_WinResTarget_get_target,$(2))
 
 endef
 
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index f97b256909dd..07da2dd67b14 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -500,7 +500,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
     version \
 ))
 
-$(eval $(call gb_Library_add_nativeres,vcl,src))
+$(eval $(call gb_Library_add_nativeres,vcl,vcl/src))
 ifeq ($(COM),MSC)
 $(eval $(call gb_Library_add_ldflags,vcl,\
     /ENTRY:LibMain@12 \