6 files changed, 39 insertions, 14 deletions
diff --git a/Repository.mk b/Repository.mk
index 351a365c9444..147eca9b2d73 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -84,6 +84,7 @@ $(eval $(call gb_Helper_register_executables,OOO,\
 ))
 
 $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+	winextendloaderenv \
 	winlauncher \
 ))
 
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 00fb0057925e..e0c58912bc89 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -54,6 +54,7 @@ ifeq ($(OS),WNT)
 
 $(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
     ooopathutils \
+    winextendloaderenv \
 ))
 
 ifeq ($(COM),MSC)
@@ -64,10 +65,6 @@ $(eval $(call gb_Executable_add_ldflags,$(sofficebin),\
 
 endif
 
-$(eval $(call gb_Executable_add_noexception_objects,$(sofficebin),\
-    desktop/win32/source/extendloaderenvironment \
-))
-
 $(call gb_Module_get_target,desktop) : $(OUTDIR)/bin/soffice.bin
 
 $(OUTDIR)/bin/soffice.bin : $(call gb_Executable_get_target,$(sofficebin))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index f768d99041d1..b1698985401a 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -29,10 +29,6 @@ $(eval $(call gb_Executable_Executable,soffice))
 
 $(eval $(call gb_Executable_set_targettype_gui,soffice,YES))
 
-$(eval $(call gb_Executable_set_include,soffice,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_linked_libs,soffice,\
     sal \
     advapi32 \
@@ -43,10 +39,10 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
     ooopathutils \
+    winextendloaderenv \
 ))
 
 $(eval $(call gb_Executable_add_noexception_objects,soffice,\
-    desktop/win32/source/extendloaderenvironment \
     desktop/win32/source/officeloader/officeloader \
 ))
 
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index 9e4a49025084..74d957e97e14 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -29,16 +29,12 @@ $(eval $(call gb_Executable_Executable,unopkg))
 
 $(eval $(call gb_Executable_set_targettype_gui,unopkg,YES))
 
-$(eval $(call gb_Executable_set_include,unopkg,\
-    $$(INCLUDE) \
-))
-
 $(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
     ooopathutils \
+    winextendloaderenv \
 ))
 
 $(eval $(call gb_Executable_add_noexception_objects,unopkg,\
-    desktop/win32/source/extendloaderenvironment \
     desktop/win32/source/guiloader/genericloader \
 ))
 
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 7229fb808c74..0d3a01331754 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -79,6 +79,7 @@ endif
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Module_add_targets,desktop,\
+    StaticLibrary_winextendloaderenv \
     StaticLibrary_winlauncher \
     Executable_crashrep.com \
     Executable_quickstart \
diff --git a/desktop/StaticLibrary_winextendloaderenv.mk b/desktop/StaticLibrary_winextendloaderenv.mk
new file mode 100644
index 000000000000..9662d67b2fcc
--- /dev/null
+++ b/desktop/StaticLibrary_winextendloaderenv.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# [ Copyright (C) 2012 Red Hat, Inc., Michael Stahl <mstahl@redhat.com> (initial developer) ]
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,winextendloaderenv))
+
+$(eval $(call gb_StaticLibrary_add_noexception_objects,winextendloaderenv,\
+    desktop/win32/source/extendloaderenvironment \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab: