Wed Apr 24 08:42:04 PDT 2013

desktop/Executable_quickstart.mk        |    2 
 desktop/Executable_sbase.mk             |    2 
 desktop/Executable_scalc.mk             |    2 
 desktop/Executable_sdraw.mk             |    2 
 desktop/Executable_simpress.mk          |    2 
 desktop/Executable_smath.mk             |    2 
 desktop/Executable_soffice.mk           |    2 
 desktop/Executable_soffice_bin.mk       |    2 
 desktop/Executable_sweb.mk              |    2 
 desktop/Executable_swriter.mk           |    2 
 desktop/WinResTarget_quickstart.mk      |    8 +--
 desktop/WinResTarget_sbase.mk           |   10 ++--
 desktop/WinResTarget_scalc.mk           |   10 ++--
 desktop/WinResTarget_sdraw.mk           |   10 ++--
 desktop/WinResTarget_simpress.mk        |   10 ++--
 desktop/WinResTarget_smath.mk           |   10 ++--
 desktop/WinResTarget_soffice.mk         |   10 ++--
 desktop/WinResTarget_sofficebin.mk      |   10 ++--
 desktop/WinResTarget_sweb.mk            |   10 ++--
 desktop/WinResTarget_swriter.mk         |   10 ++--
 extensions/Library_npsoplugin.mk        |    6 +-
 extensions/Library_so_activex.mk        |    2 
 extensions/Library_so_activex_x64.mk    |    2 
 extensions/WinResTarget_activex.mk      |   10 ++--
 extensions/WinResTarget_npsoplugin.mk   |    4 -
 fpicker/Library_fps.mk                  |    2 
 fpicker/WinResTarget_fps.mk             |    4 -
 include/default.rc                      |   72 +++++++++++++++++++++++++++++++
 include/shlinfo.rc                      |   72 -------------------------------
 solenv/gbuild/AllLangResTarget.mk       |    5 +-
 solenv/gbuild/LinkTarget.mk             |    2 
 solenv/gbuild/PrecompiledHeaders.mk     |    4 -
 solenv/gbuild/platform/WNT_INTEL_GCC.mk |   12 +----
 solenv/gbuild/platform/com_MSC_class.mk |   22 +++------
 solenv/gbuild/processdeps.awk           |   73 --------------------------------
 soltools/mkdepend/def.h                 |    1 
 soltools/mkdepend/main.c                |   12 +++++
 soltools/mkdepend/pr.c                  |   34 +++++++++++++-
 vcl/Library_vcl.mk                      |    3 -
 vcl/WinResTarget_vcl.mk                 |    8 +--
 40 files changed, 212 insertions(+), 256 deletions(-)

New commits:
commit 8379fceb2e7c33e5e0555295be06fde60a6bb240
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:04:33 2013 +0200

    gbuild: AllLangResTarget: use concat-deps
    
    Change-Id: Ieb5e380b6e7a1c097d403f962b4e82b84cce40b5

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 29f6bc0..c413460 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -237,7 +237,8 @@ define gb_SrsTarget__command_dep
 $(call gb_Output_announce,SRS:$(2),$(true),DEP,1)
 $(call gb_Helper_abbreviate_dirs,\
 	mkdir -p $(dir $(1)) && \
-	cat $(3) > $(1))
+	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),200,$(3)) && \
+	$(call gb_Executable_get_command,concat-deps) $${RESPONSEFILE} > $(1))
 endef
 endif
 
commit 7019a1c67473623cb81ca0c9e155b90a5ce6947a
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:08:46 2013 +0200

    gbuild: get rid of processdeps.awk
    
    The only thing that processdeps.awk does that is actually useful is to
    be able to set the target name freely, but that is only important for
    the default resource file which was just renamed.
    
    Instead hack makedepend to provide the required functionality directly:
    - write dummy rules for included files so builds don't break on
      rename/removal
    - format deps one per line like concat-deps expects
    - concat-deps expects standard POSIX line ends, so open in binary mode
      (also disable that awful backup copying nonsense)
    
    Though in retrospect it would perhaps be a better investment of time to
    try to replace makedepend...
    
    Change-Id: I54fafdcdcf1a52692e62b8f1f4b96fb9a93d4421

diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 2acbc6c..8df958f 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -362,13 +362,9 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(INCLUDE) \
 		$(DEFS) \
 		$(RCFILE) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(3) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-	> $(1))
+		-o .res \
+		-p $(dir $(3)) \
+		-f $(1))
 endef
 else
 gb_WinResTarget__command_target =
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index 92b8e03..94db603 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -484,13 +484,9 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(INCLUDE) \
 		$(DEFS) \
 		$(2) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-	> $(call gb_SrsPartTarget_get_dep_target,$(1)))
+		-o .src \
+		-p $(dir $(call gb_SrsPartTarget_get_target,$(1))) \
+		-f $(call gb_SrsPartTarget_get_dep_target,$(1)))
 endef
 else
 gb_SrsPartTarget__command_target =
@@ -532,13 +528,9 @@ $(call gb_Helper_abbreviate_dirs,\
 		$(INCLUDE) \
 		$(DEFS) \
 		$(RCFILE) \
-		-f - \
-	| $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \
-		-v OBJECTFILE=$(3) \
-		-v OUTDIR=$(OUTDIR)/ \
-		-v WORKDIR=$(WORKDIR)/ \
-		-v SRCDIR=$(SRCDIR)/ \
-	> $(1))
+		-o .res \
+		-p $(dir $(3)) \
+		-f $(1))
 endef
 else
 gb_WinResTarget__command_target =
diff --git a/solenv/gbuild/processdeps.awk b/solenv/gbuild/processdeps.awk
deleted file mode 100644
index e564b0b..0000000
--- a/solenv/gbuild/processdeps.awk
+++ /dev/null
@@ -1,73 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# this awk script mangles makedepend output for a single object file
-# usage:
-# awk -f .../processdeps.awk \
-#     -v OUTDIR=outdir \
-#     -v SRCDIR=srcdir \
-#     -v WORKDIR=workdir \
-#     -v OBJECTFILE=objectfile
-# called like this the script will read from stdin
-# and write to stdout. It will:
-#  - replace the objectfile with the one given on the commandline
-#  - normalize paths to mixed paths (replacing all \ with /)
-#  - replace the string given as WORKDIR with $(WORKDIR)/
-#  - replace the string given as OUTDIR with $(OUTDIR)/
-#  - replace the string given as SRCDIR with $(SRCDIR)/
-#  - translates absolute mixed windows paths to cygwin paths by
-#    substituting a path starting with X:... to /cygdrive/X/...
-
-function mangle_path(path) {
-    gsub("\\\\", "/", path);
-    if( path ~ /^[a-zA-Z]:/ )
-        path = tolower(substr(path,0,1)) substr(path,2);
-    gsub(WORKDIR, "$(WORKDIR)/", path);
-    gsub(OUTDIR, "$(OUTDIR)/", path);
-    gsub(SRCDIR, "$(SRCDIR)/", path);
-    if( path ~ /^[a-zA-Z]:/ )
-        path = "/cygdrive/" tolower(substr(path,0,1)) substr(path,3);
-    return path;
-}
-
-BEGIN {
-   WORKDIR = tolower(substr(WORKDIR,0,1)) substr(WORKDIR,2); 
-   OUTDIR = tolower(substr(OUTDIR,0,1)) substr(OUTDIR,2); 
-   SRCDIR = tolower(substr(SRCDIR,0,1)) substr(SRCDIR,2); 
-#   print "# WORKDIR=" WORKDIR;
-#   print "# OUTDIR=" OUTDIR;
-#   print "# SRCDIR=" SRCDIR;
-   print mangle_path(OBJECTFILE) ": \\";
-}
-
-/^[^#]/ {
-    print "\t" mangle_path($2) " \\";
-}
-
-END {
-    print "\n";
-}
diff --git a/soltools/mkdepend/def.h b/soltools/mkdepend/def.h
index 1ec8382..1c0e91a 100644
--- a/soltools/mkdepend/def.h
+++ b/soltools/mkdepend/def.h
@@ -181,6 +181,7 @@ void add_include(struct filepointer *filep, struct inclist *file,
 int match(register char *str, register char **list);
 void recursive_pr_include(register struct inclist *head, register char *file,
     register char *base);
+void recursive_pr_dummy(register struct inclist *head, register char *file);
 void inc_clean();
 
 void fatalerr(char *, ...);
diff --git a/soltools/mkdepend/main.c b/soltools/mkdepend/main.c
index 5beb8fd..149bae1 100644
--- a/soltools/mkdepend/main.c
+++ b/soltools/mkdepend/main.c
@@ -461,6 +461,9 @@ int main(argc, argv)
 
         freefile(filecontent);
         recursive_pr_include(ip, ip->i_file, base_name(*fp));
+        if (printed)
+            fwrite("\n\n", 2, 1, stdout);
+        recursive_pr_dummy(ip, ip->i_file);
         inc_clean();
     }
     if (printed)
@@ -660,6 +663,14 @@ void redirect(line, makefile)
     char    *line,
         *makefile;
 {
+    FILE    *fdout;
+    fdout = freopen(makefile, "wb", stdout); // binary mode please
+    if (fdout == NULL)
+        fatalerr("cannot open \"%s\"\n", makefile);
+    (void) line;
+
+    // don't need any of that nonsense
+#if 0
     struct stat st;
     FILE    *fdin, *fdout;
     char    backup[ BUFSIZ ],
@@ -724,6 +735,7 @@ void redirect(line, makefile)
     fchmod(fileno(fdout), st.st_mode);
 #endif /* USGISH */
     fclose(fdin);
+#endif
 }
 
 void fatalerr(char *msg, ...)
diff --git a/soltools/mkdepend/pr.c b/soltools/mkdepend/pr.c
index f472f28..e620078 100644
--- a/soltools/mkdepend/pr.c
+++ b/soltools/mkdepend/pr.c
@@ -79,6 +79,29 @@ void add_include(struct filepointer *filep, struct inclist *file, struct inclist
     }
 }
 
+void pr_dummy(ip)
+    register struct inclist  *ip;
+{
+    fwrite(ip->i_file, strlen(ip->i_file), 1, stdout);
+    fwrite(" :\n\n", 4, 1, stdout);
+}
+
+void recursive_pr_dummy(head, file)
+    register struct inclist *head;
+    register char   *file;
+{
+    register int    i;
+
+    if (head->i_marked == 2)
+        return;
+    head->i_marked = 2; // it's a large boolean...
+    if (head->i_file != file)
+        pr_dummy(head, file);
+    for (i=0; i<head->i_listlen; i++)
+        recursive_pr_dummy(head->i_list[ i ], file);
+}
+
+
 void recursive_pr_include(head, file, base)
     register struct inclist *head;
     register char   *file, *base;
@@ -105,16 +128,19 @@ size_t pr(ip, file, base)
     char    buf[ BUFSIZ ];
 
     printed = TRUE;
-    len = (int)strlen(ip->i_file)+1;
-    if (current_len + len > width || file != lastfile) {
+    len = (int)strlen(ip->i_file)+4;
+    if (file != lastfile) {
         lastfile = file;
-        sprintf(buf, "\n%s%s%s: %s", objprefix, base, objsuffix,
+        sprintf(buf, "\n%s%s%s: \\\n %s", objprefix, base, objsuffix,
             ip->i_file);
         len = current_len = (int)strlen(buf);
     }
     else {
         buf[0] = ' ';
-        strcpy(buf+1, ip->i_file);
+        buf[1] = '\\';
+        buf[2] = '\n';
+        buf[3] = ' ';
+        strcpy(buf+4, ip->i_file);
         current_len += len;
     }
     ret = fwrite(buf, len, 1, stdout);
commit ced9e2abecbbdf70acb3ca46c5e6a6d4247015c0
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:58:51 2013 +0200

    desktop: rename WinResTarget target to match source file
    
    Change-Id: Ice900801109efc8591b9a3fb5c490d070b23730a

diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index 0d84e35..a4b18c5 100644
--- a/desktop/Executable_quickstart.mk
+++ b/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:
diff --git a/desktop/Executable_sbase.mk b/desktop/Executable_sbase.mk
index fe28ab1..4a35040 100644
--- a/desktop/Executable_sbase.mk
+++ b/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:
diff --git a/desktop/Executable_scalc.mk b/desktop/Executable_scalc.mk
index ff262d7..66ee9c6 100644
--- a/desktop/Executable_scalc.mk
+++ b/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:
diff --git a/desktop/Executable_sdraw.mk b/desktop/Executable_sdraw.mk
index 7b44c47..b552970 100644
--- a/desktop/Executable_sdraw.mk
+++ b/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:
diff --git a/desktop/Executable_simpress.mk b/desktop/Executable_simpress.mk
index 0b6c190..18c1544 100644
--- a/desktop/Executable_simpress.mk
+++ b/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:
diff --git a/desktop/Executable_smath.mk b/desktop/Executable_smath.mk
index f0ef469..bb83a18 100644
--- a/desktop/Executable_smath.mk
+++ b/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:
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index d320cb2..3d3c39d 100644
--- a/desktop/Executable_soffice.mk
+++ b/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:
diff --git a/desktop/Executable_soffice_bin.mk b/desktop/Executable_soffice_bin.mk
index d159431..53fc551 100644
--- a/desktop/Executable_soffice_bin.mk
+++ b/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:
diff --git a/desktop/Executable_sweb.mk b/desktop/Executable_sweb.mk
index e25a82b..6140f0a 100644
--- a/desktop/Executable_sweb.mk
+++ b/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:
diff --git a/desktop/Executable_swriter.mk b/desktop/Executable_swriter.mk
index 1cd7c0a..a5ac288 100644
--- a/desktop/Executable_swriter.mk
+++ b/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:
diff --git a/desktop/WinResTarget_quickstart.mk b/desktop/WinResTarget_quickstart.mk
index 330ae3d..9f80cf6 100644
--- a/desktop/WinResTarget_quickstart.mk
+++ b/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:
diff --git a/desktop/WinResTarget_sbase.mk b/desktop/WinResTarget_sbase.mk
index 583b49c..d255a35 100644
--- a/desktop/WinResTarget_sbase.mk
+++ b/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:
diff --git a/desktop/WinResTarget_scalc.mk b/desktop/WinResTarget_scalc.mk
index 192dcb1..ef5a48e 100644
--- a/desktop/WinResTarget_scalc.mk
+++ b/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:
diff --git a/desktop/WinResTarget_sdraw.mk b/desktop/WinResTarget_sdraw.mk
index e97b050..7ad5a7c 100644
--- a/desktop/WinResTarget_sdraw.mk
+++ b/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:
 
diff --git a/desktop/WinResTarget_simpress.mk b/desktop/WinResTarget_simpress.mk
index ff98860..6f4ba4f 100644
--- a/desktop/WinResTarget_simpress.mk
+++ b/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:
diff --git a/desktop/WinResTarget_smath.mk b/desktop/WinResTarget_smath.mk
index 6837845..f1efe6f 100644
--- a/desktop/WinResTarget_smath.mk
+++ b/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:
diff --git a/desktop/WinResTarget_soffice.mk b/desktop/WinResTarget_soffice.mk
index e0a4eed..d9e870c 100644
--- a/desktop/WinResTarget_soffice.mk
+++ b/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:
diff --git a/desktop/WinResTarget_sofficebin.mk b/desktop/WinResTarget_sofficebin.mk
index 3dbb185..39cfead 100644
--- a/desktop/WinResTarget_sofficebin.mk
+++ b/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:
diff --git a/desktop/WinResTarget_sweb.mk b/desktop/WinResTarget_sweb.mk
index 5af686e..91aba01 100644
--- a/desktop/WinResTarget_sweb.mk
+++ b/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:
diff --git a/desktop/WinResTarget_swriter.mk b/desktop/WinResTarget_swriter.mk
index b17aee1..5830497 100644
--- a/desktop/WinResTarget_swriter.mk
+++ b/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:
commit 7dc8c952be0595ef0fb161bd524aaff0d3f791d2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:46:01 2013 +0200

    extensions: rename WinResTarget target to match source file
    
    Change-Id: I8e528f76d08f7a0d7acec05dcf306cd78b95a885

diff --git a/extensions/Library_npsoplugin.mk b/extensions/Library_npsoplugin.mk
index 4ea7947..8df812e 100644
--- a/extensions/Library_npsoplugin.mk
+++ b/extensions/Library_npsoplugin.mk
@@ -116,10 +116,10 @@ $(eval $(call gb_Library_add_ldflags,npsoplugin,\
 endif
 
 # Trick to get rid of the default.res to avoid duplicate VERSION
-# resource: Set NATIVERES for npsoplugin to be *only* npsoplugin_res
+# resource: Set NATIVERES for npsoplugin to be *only* nsplugin_oo
 
-$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,npsoplugin_res))
-$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,npsoplugin_res))
+$(eval $(call gb_LinkTarget_get_target,npsoplugin) : $(call gb_WinResTarget_get_target,nsplugin_oo))
+$(eval $(call gb_LinkTarget_get_target,npsoplugin) : NATIVERES := $(call gb_WinResTarget_get_target,nsplugin_oo))
 
 endif # GUI=WNT
 
diff --git a/extensions/Library_so_activex.mk b/extensions/Library_so_activex.mk
index 80571d8..6460812 100644
--- a/extensions/Library_so_activex.mk
+++ b/extensions/Library_so_activex.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_Library_set_include,so_activex,\
 
 $(eval $(call gb_Library_use_sdk_api,so_activex))
 
-$(eval $(call gb_Library_add_nativeres,so_activex,activex_res))
+$(eval $(call gb_Library_add_nativeres,so_activex,so_activex))
 
 $(eval $(call gb_Library_add_exception_objects,so_activex,\
 	extensions/source/activex/so_activex \
diff --git a/extensions/Library_so_activex_x64.mk b/extensions/Library_so_activex_x64.mk
index 96ee19d..cc76b7f 100644
--- a/extensions/Library_so_activex_x64.mk
+++ b/extensions/Library_so_activex_x64.mk
@@ -42,7 +42,7 @@ $(eval $(call gb_Library_set_include,so_activex_x64,\
 
 $(eval $(call gb_Library_use_sdk_api,so_activex_x64))
 
-$(eval $(call gb_Library_add_nativeres,so_activex_x64,activex_res))
+$(eval $(call gb_Library_add_nativeres,so_activex_x64,so_activex))
 
 $(eval $(call gb_Library_add_x64_generated_exception_objects,so_activex_x64,\
 	CustomTarget/extensions/source/activex/so_activex \
diff --git a/extensions/WinResTarget_activex.mk b/extensions/WinResTarget_activex.mk
index aab7a6c..3d383df 100644
--- a/extensions/WinResTarget_activex.mk
+++ b/extensions/WinResTarget_activex.mk
@@ -28,21 +28,21 @@
 # instead of those above.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,activex_res))
+$(eval $(call gb_WinResTarget_WinResTarget,so_activex))
 
-$(eval $(call gb_WinResTarget_use_custom_headers,activex_res,\
+$(eval $(call gb_WinResTarget_use_custom_headers,so_activex,\
     extensions/source/activex/idl \
 ))
 
 ifneq ($(ENABLE_DBGUTIL),TRUE)
-$(eval $(call gb_WinResTarget_add_defs,activex_res,\
+$(eval $(call gb_WinResTarget_add_defs,so_activex,\
 	-DPRODUCT \
 ))
 endif
 
-$(eval $(call gb_WinResTarget_set_rcfile,activex_res,extensions/source/activex/so_activex))
+$(eval $(call gb_WinResTarget_set_rcfile,so_activex,extensions/source/activex/so_activex))
 
-$(eval $(call gb_WinResTarget_add_defs,activex_res,\
+$(eval $(call gb_WinResTarget_add_defs,so_activex,\
 	$$(DEFS) \
 	-DSO_ACTIVEX_TLB=\"$(subst /,\\\\,$(WORKDIR)/CustomTarget/extensions/source/activex/idl/so_activex.tlb\") \
 ))
diff --git a/extensions/WinResTarget_npsoplugin.mk b/extensions/WinResTarget_npsoplugin.mk
index 9a8b5d4..cca787a 100644
--- a/extensions/WinResTarget_npsoplugin.mk
+++ b/extensions/WinResTarget_npsoplugin.mk
@@ -28,8 +28,8 @@
 # instead of those above.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,npsoplugin_res))
+$(eval $(call gb_WinResTarget_WinResTarget,nsplugin_oo))
 
-$(eval $(call gb_WinResTarget_set_rcfile,npsoplugin_res,extensions/source/nsplugin/source/nsplugin_oo))
+$(eval $(call gb_WinResTarget_set_rcfile,nsplugin_oo,extensions/source/nsplugin/source/nsplugin_oo))
 
 # vim:set noet sw=4 ts=4:
commit e4389abdfa6915f33cd0d918e86015af2b6be4b7
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:37:01 2013 +0200

    fpicker: rename WinResTarget target to match source file
    
    Change-Id: Icdc6ff082daaaca5458b817109738b5debdf4007

diff --git a/fpicker/Library_fps.mk b/fpicker/Library_fps.mk
index 52e925e..e1d63eb 100644
--- a/fpicker/Library_fps.mk
+++ b/fpicker/Library_fps.mk
@@ -27,7 +27,7 @@
 
 $(eval $(call gb_Library_Library,fps))
 
-$(eval $(call gb_Library_add_nativeres,fps,fps/src))
+$(eval $(call gb_Library_add_nativeres,fps,fps/Fps))
 
 $(eval $(call gb_Library_set_componentfile,fps,fpicker/source/win32/fps))
 
diff --git a/fpicker/WinResTarget_fps.mk b/fpicker/WinResTarget_fps.mk
index 2cd6b14..ef69bde 100644
--- a/fpicker/WinResTarget_fps.mk
+++ b/fpicker/WinResTarget_fps.mk
@@ -7,8 +7,8 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,fps/src))
+$(eval $(call gb_WinResTarget_WinResTarget,fps/Fps))
 
-$(eval $(call gb_WinResTarget_set_rcfile,fps/src,fpicker/source/win32/filepicker/Fps))
+$(eval $(call gb_WinResTarget_set_rcfile,fps/Fps,fpicker/source/win32/filepicker/Fps))
 
 # vim: set ts=4 sw=4 et:
commit ca629ad33233fd7813df5097063ad3ae6a1e3757
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:32:53 2013 +0200

    vcl: rename WinResTarget target to match source file
    
    makedepend relies on that
    
    Change-Id: I6a166f65d25c2750c24bc7831d074c32f6524722

diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
index 4b8596b..88cbfcf 100644
--- a/vcl/Library_vcl.mk
+++ b/vcl/Library_vcl.mk
@@ -654,7 +654,8 @@ $(eval $(call gb_Library_use_system_win32_libs,vcl,\
 	winspool \
 ))
 
-$(eval $(call gb_Library_add_nativeres,vcl,vcl/src))
+$(eval $(call gb_Library_add_nativeres,vcl,vcl/salsrc))
+
 ifeq ($(COM),MSC)
 ifeq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_ldflags,vcl,\
diff --git a/vcl/WinResTarget_vcl.mk b/vcl/WinResTarget_vcl.mk
index cdd898d..48daadd 100644
--- a/vcl/WinResTarget_vcl.mk
+++ b/vcl/WinResTarget_vcl.mk
@@ -17,17 +17,17 @@
 #   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 #
 
-$(eval $(call gb_WinResTarget_WinResTarget,vcl/src))
+$(eval $(call gb_WinResTarget_WinResTarget,vcl/salsrc))
 
-$(eval $(call gb_WinResTarget_set_include,vcl/src,\
+$(eval $(call gb_WinResTarget_set_include,vcl/salsrc,\
     $$(INCLUDE) \
     -I$(SRCDIR)/vcl/inc \
 ))
 
-$(eval $(call gb_WinResTarget_set_rcfile,vcl/src,\
+$(eval $(call gb_WinResTarget_set_rcfile,vcl/salsrc,\
     vcl/win/source/src/salsrc \
 ))
-$(eval $(call gb_WinResTarget_add_dependencies,vcl/src,\
+$(eval $(call gb_WinResTarget_add_dependencies,vcl/salsrc,\
     vcl/win/source/src/dtext.cur \
     vcl/win/source/src/50.bmp \
     vcl/win/source/src/copydata.cur \
commit ed0f2c949692bb9096144c8d063b38207a6f5808
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 16:01:35 2013 +0200

    rename "shlinfo.rc" to "default.rc"
    
    makedepend annoyingly picks up the target file name from the source file
    
    Change-Id: I4e7378e3f428dbae42fb99cb1c21ed840c20da40

diff --git a/include/shlinfo.rc b/include/default.rc
similarity index 100%
rename from include/shlinfo.rc
rename to include/default.rc
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
index 26be344..2acbc6c 100644
--- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk
+++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk
@@ -270,7 +270,7 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(2))
-$(call gb_WinResTarget_set_rcfile,$(2),include/shlinfo)
+$(call gb_WinResTarget_set_rcfile,$(2),include/default)
 $(call gb_WinResTarget_add_defs,$(2),\
 		-DVERVARIANT="$(LIBO_VERSION_PATCH)" \
 		-DRES_APP_VENDOR="$(OOO_VENDOR)" \
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index f3eb49c..92b8e03 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -328,7 +328,7 @@ endef
 
 define gb_Library_add_default_nativeres
 $(call gb_WinResTarget_WinResTarget_init,$(2))
-$(call gb_WinResTarget_set_rcfile,$(2),include/shlinfo)
+$(call gb_WinResTarget_set_rcfile,$(2),include/default)
 $(call gb_WinResTarget_add_defs,$(2),\
 		-DVERVARIANT="$(LIBO_VERSION_PATCH)" \
 		-DRES_APP_VENDOR="$(OOO_VENDOR)" \
commit 45a420b2f5ea1765ca3da3f31a4b357e292e0423
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Apr 24 15:52:37 2013 +0200

    gbuild: do not use ' quotes when echoing dependencies
    
    In AllLangResTarget the gb_Helper_abbreviate_dirs replaces the paths in
    the echo command with $W, which the shell then does not expand due to '
    quotes.  Mixing gb_Helper_abbreviate_dirs and ' is unsafe.
    
    Change-Id: Ia99d185917a55486d5fd67f82d5b323a05e3f5bd

diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index 9638d24..29f6bc0 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -112,7 +112,7 @@ ifeq ($(gb_FULLDEPS),$(true))
 $(call gb_SrsPartTarget_get_dep_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY)
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
-		echo '$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)' > $@)
+		echo "$(call gb_SrsPartTarget_get_target,$*) : $(gb_Helper_PHONY)" > $@)
 endif
 
 
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 60747e2..9151444 100755
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -114,7 +114,7 @@ endef
 ifeq ($(gb_FULLDEPS),$(true))
 define gb_Object__command_dep
 mkdir -p $(dir $(1)) && \
-	echo '$(2) : $$(gb_Helper_PHONY)' > $(1)
+	echo "$(2) : $$(gb_Helper_PHONY)" > $(1)
 
 endef
 else
diff --git a/solenv/gbuild/PrecompiledHeaders.mk b/solenv/gbuild/PrecompiledHeaders.mk
index 56acfd0..8aefc1b3 100644
--- a/solenv/gbuild/PrecompiledHeaders.mk
+++ b/solenv/gbuild/PrecompiledHeaders.mk
@@ -43,12 +43,12 @@ endif
 $(call gb_PrecompiledHeader_get_dep_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
-		echo '$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+		echo "$(call gb_PrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)" > $@)
 
 $(call gb_NoexPrecompiledHeader_get_dep_target,%) :
 	$(call gb_Helper_abbreviate_dirs,\
 		mkdir -p $(dir $@) && \
-		echo '$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)' > $@)
+		echo "$(call gb_NoexPrecompiledHeader_get_target,$*) : $$(gb_Helper_PHONY)" > $@)
 
 $(call gb_PrecompiledHeader_get_target,%) :
 	$(call gb_PrecompiledHeader__command,$@,$*,$<,$(PCH_DEFS),$(PCH_CXXFLAGS) $(gb_PrecompiledHeader_EXCEPTIONFLAGS),$(INCLUDE))
