desktop: rename WinResTarget target to match source file

Change-Id: Ice900801109efc8591b9a3fb5c490d070b23730a

desktop/Executable_quickstart.mk

@@ -41,6 +41,6 @@ $(eval $(call gb_Executable_add_exception_objects,quickstart,\
     desktop/win32/source/QuickStart/QuickStart \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,quickstart,quickstart/src))
+$(eval $(call gb_Executable_add_nativeres,quickstart,quickstart/QuickStart))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_sbase.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sbase,\
     desktop/win32/source/applauncher/sbase \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,sbase,sbase/src))
+$(eval $(call gb_Executable_add_nativeres,sbase,sbase/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_scalc.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,scalc,\
     desktop/win32/source/applauncher/scalc \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,scalc,scalc/src))
+$(eval $(call gb_Executable_add_nativeres,scalc,scalc/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_sdraw.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sdraw,\
     desktop/win32/source/applauncher/sdraw \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,sdraw,sdraw/src))
+$(eval $(call gb_Executable_add_nativeres,sdraw,sdraw/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_simpress.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,simpress,\
     desktop/win32/source/applauncher/simpress \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,simpress,simpress/src))
+$(eval $(call gb_Executable_add_nativeres,simpress,simpress/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_smath.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,smath,\
     desktop/win32/source/applauncher/smath \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,smath,smath/src))
+$(eval $(call gb_Executable_add_nativeres,smath,smath/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_soffice.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,soffice,\
     desktop/win32/source/officeloader/officeloader \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,soffice,soffice/src))
+$(eval $(call gb_Executable_add_nativeres,soffice,soffice/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_soffice_bin.mk

@@ -54,6 +54,6 @@ $(WORKDIR)/Clean/OutDir/bin/soffice.bin.manifest :
 
 endif
 
-$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/src))
+$(eval $(call gb_Executable_add_nativeres,soffice_bin,sofficebin/officeloader))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_sweb.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,sweb,\
     desktop/win32/source/applauncher/sweb \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,sweb,sweb/src))
+$(eval $(call gb_Executable_add_nativeres,sweb,sweb/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/Executable_swriter.mk

@@ -30,6 +30,6 @@ $(eval $(call gb_Executable_add_noexception_objects,swriter,\
     desktop/win32/source/applauncher/swriter \
 ))
 
-$(eval $(call gb_Executable_add_nativeres,swriter,swriter/src))
+$(eval $(call gb_Executable_add_nativeres,swriter,swriter/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_quickstart.mk

@@ -7,18 +7,18 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,quickstart/src))
+$(eval $(call gb_WinResTarget_WinResTarget,quickstart/QuickStart))
 
-$(eval $(call gb_WinResTarget_set_include,quickstart/src,\
+$(eval $(call gb_WinResTarget_set_include,quickstart/QuickStart,\
     $$(INCLUDE) \
     -I$(SRCDIR)/desktop/win32/source/QuickStart \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,quickstart/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,quickstart/QuickStart,\
     sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,quickstart/src,desktop/win32/source/QuickStart/QuickStart))
+$(eval $(call gb_WinResTarget_set_rcfile,quickstart/QuickStart,desktop/win32/source/QuickStart/QuickStart))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_sbase.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,sbase/src))
+$(eval $(call gb_WinResTarget_WinResTarget,sbase/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,sbase/src,\
+$(eval $(call gb_WinResTarget_set_include,sbase/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,sbase/src,\
+$(eval $(call gb_WinResTarget_add_defs,sbase/launcher,\
     -DRES_APP_NAME=sbase \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Base" \
     -DRES_APP_ICON=icons/base_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,sbase/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,sbase/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,sbase/launcher,\
     sysui/desktop/icons/base_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,sbase/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,sbase/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_scalc.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,scalc/src))
+$(eval $(call gb_WinResTarget_WinResTarget,scalc/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,scalc/src,\
+$(eval $(call gb_WinResTarget_set_include,scalc/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,scalc/src,\
+$(eval $(call gb_WinResTarget_add_defs,scalc/launcher,\
     -DRES_APP_NAME=scalc \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Calc" \
     -DRES_APP_ICON=icons/calc_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,scalc/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,scalc/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,scalc/launcher,\
     sysui/desktop/icons/calc_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,scalc/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,scalc/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_sdraw.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,sdraw/src))
+$(eval $(call gb_WinResTarget_WinResTarget,sdraw/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,sdraw/src,\
+$(eval $(call gb_WinResTarget_set_include,sdraw/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,sdraw/src,\
+$(eval $(call gb_WinResTarget_add_defs,sdraw/launcher,\
     -DRES_APP_NAME=sdraw \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Draw" \
     -DRES_APP_ICON=icons/draw_app.ico \
@@ -22,11 +22,11 @@ $(eval $(call gb_WinResTarget_add_defs,sdraw/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,sdraw/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,sdraw/launcher,\
     sysui/desktop/icons/draw_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,sdraw/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,sdraw/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:
 

desktop/WinResTarget_simpress.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,simpress/src))
+$(eval $(call gb_WinResTarget_WinResTarget,simpress/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,simpress/src,\
+$(eval $(call gb_WinResTarget_set_include,simpress/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,simpress/src,\
+$(eval $(call gb_WinResTarget_add_defs,simpress/launcher,\
     -DRES_APP_NAME=simpress \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Impress" \
     -DRES_APP_ICON=icons/impress_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,simpress/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,simpress/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,simpress/launcher,\
     sysui/desktop/icons/impress_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,simpress/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,simpress/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_smath.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,smath/src))
+$(eval $(call gb_WinResTarget_WinResTarget,smath/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,smath/src,\
+$(eval $(call gb_WinResTarget_set_include,smath/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,smath/src,\
+$(eval $(call gb_WinResTarget_add_defs,smath/launcher,\
     -DRES_APP_NAME=smath \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Math" \
     -DRES_APP_ICON=icons/math_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,smath/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,smath/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,smath/launcher,\
     sysui/desktop/icons/math_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,smath/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,smath/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_soffice.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,soffice/src))
+$(eval $(call gb_WinResTarget_WinResTarget,soffice/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,soffice/src,\
+$(eval $(call gb_WinResTarget_set_include,soffice/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,soffice/src,\
+$(eval $(call gb_WinResTarget_add_defs,soffice/launcher,\
     -DRES_APP_NAME=soffice \
     -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
     -DRES_APP_ICON=icons/main_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,soffice/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,soffice/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,soffice/launcher,\
     sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,soffice/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,soffice/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_sofficebin.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,sofficebin/src))
+$(eval $(call gb_WinResTarget_WinResTarget,sofficebin/officeloader))
 
-$(eval $(call gb_WinResTarget_set_include,sofficebin/src,\
+$(eval $(call gb_WinResTarget_set_include,sofficebin/officeloader,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,sofficebin/src,\
+$(eval $(call gb_WinResTarget_add_defs,sofficebin/officeloader,\
     -DRES_APP_NAME=soffice \
     -DRES_APP_FILEDESC="$(PRODUCTNAME)" \
     -DRES_APP_ICON=icons/main_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,sofficebin/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,sofficebin/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,sofficebin/officeloader,\
     sysui/desktop/icons/main_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,sofficebin/src,desktop/util/officeloader))
+$(eval $(call gb_WinResTarget_set_rcfile,sofficebin/officeloader,desktop/util/officeloader))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_sweb.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,sweb/src))
+$(eval $(call gb_WinResTarget_WinResTarget,sweb/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,sweb/src,\
+$(eval $(call gb_WinResTarget_set_include,sweb/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,sweb/src,\
+$(eval $(call gb_WinResTarget_add_defs,sweb/launcher,\
     -DRES_APP_NAME=sweb \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer (Web)" \
     -DRES_APP_ICON=icons/writer_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,sweb/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,sweb/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,sweb/launcher,\
     sysui/desktop/icons/writer_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,sweb/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,sweb/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et:

desktop/WinResTarget_swriter.mk

@@ -7,14 +7,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,swriter/src))
+$(eval $(call gb_WinResTarget_WinResTarget,swriter/launcher))
 
-$(eval $(call gb_WinResTarget_set_include,swriter/src,\
+$(eval $(call gb_WinResTarget_set_include,swriter/launcher,\
     $$(INCLUDE) \
     -I$(SRCDIR)/sysui/desktop \
 ))
 
-$(eval $(call gb_WinResTarget_add_defs,swriter/src,\
+$(eval $(call gb_WinResTarget_add_defs,swriter/launcher,\
     -DRES_APP_NAME=swriter \
     -DRES_APP_FILEDESC="$(PRODUCTNAME) Writer" \
     -DRES_APP_ICON=icons/writer_app.ico \
@@ -22,10 +22,10 @@ $(eval $(call gb_WinResTarget_add_defs,swriter/src,\
     -DRES_APP_VENDOR="$(OOO_VENDOR)" \
 ))
 
-$(eval $(call gb_WinResTarget_add_dependencies,swriter/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,swriter/launcher,\
     sysui/desktop/icons/writer_app.ico \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,swriter/src,desktop/win32/source/applauncher/launcher))
+$(eval $(call gb_WinResTarget_set_rcfile,swriter/launcher,desktop/win32/source/applauncher/launcher))
 
 # vim: set ts=4 sw=4 et: