From 4f3e9f30a0a05a18d39161fda5f271f9b6f2a029 Mon Sep 17 00:00:00 2001
From: Tor Lillqvist <tlillqvist@suse.com>
Date: Thu, 22 Sep 2011 15:46:15 +0300
Subject: Always link with user32

---
 desktop/Executable_crashrep.com.mk | 4 ----
 desktop/Executable_loader2.mk      | 1 -
 desktop/Executable_quickstart.mk   | 2 --
 desktop/Executable_soffice.bin.mk  | 4 ----
 desktop/Executable_soffice.mk      | 1 -
 desktop/Executable_unopkg.mk       | 4 ----
 6 files changed, 16 deletions(-)

(limited to 'desktop')

diff --git a/desktop/Executable_crashrep.com.mk b/desktop/Executable_crashrep.com.mk
index 858ab1094dfa..f62a10270552 100644
--- a/desktop/Executable_crashrep.com.mk
+++ b/desktop/Executable_crashrep.com.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Executable_add_defs,crashrep_com,\
     $(LFS_CFLAGS) \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,crashrep_com,\
-    user32 \
-))
-
 $(eval $(call gb_Executable_add_exception_objects,crashrep_com,\
     desktop/win32/source/guistdio/guistdio \
 ))
diff --git a/desktop/Executable_loader2.mk b/desktop/Executable_loader2.mk
index a7ebedc2e86c..ee515009fa92 100644
--- a/desktop/Executable_loader2.mk
+++ b/desktop/Executable_loader2.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,loader2,\
     gdi32 \
     msi \
     shell32 \
-    user32 \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/desktop/Executable_quickstart.mk b/desktop/Executable_quickstart.mk
index aa6abd32f80f..6db687018132 100644
--- a/desktop/Executable_quickstart.mk
+++ b/desktop/Executable_quickstart.mk
@@ -37,11 +37,9 @@ $(eval $(call gb_Executable_set_include,quickstart,\
 $(eval $(call gb_Executable_add_linked_libs,quickstart,\
     comdlg32 \
     gdi32 \
-    kernel32 \
     ole32 \
     oleaut32 \
     shell32 \
-    user32 \
 ))
 
 ifeq ($(COM),GCC)
diff --git a/desktop/Executable_soffice.bin.mk b/desktop/Executable_soffice.bin.mk
index 3aad85f93573..7731aefd6e1e 100644
--- a/desktop/Executable_soffice.bin.mk
+++ b/desktop/Executable_soffice.bin.mk
@@ -53,10 +53,6 @@ $(eval $(call gb_Executable_add_cobjects,$(sofficebin),\
 
 ifeq ($(OS),WNT)
 
-$(eval $(call gb_Executable_add_linked_libs,$(sofficebin),\
-    user32 \
-))
-
 $(eval $(call gb_Executable_add_linked_static_libs,$(sofficebin),\
     ooopathutils \
 ))
diff --git a/desktop/Executable_soffice.mk b/desktop/Executable_soffice.mk
index 0be0fd373473..8240ef30d38e 100644
--- a/desktop/Executable_soffice.mk
+++ b/desktop/Executable_soffice.mk
@@ -39,7 +39,6 @@ $(eval $(call gb_Executable_add_linked_libs,soffice,\
     advapi32 \
     shell32 \
     shlwapi \
-    user32 \
 ))
 
 $(eval $(call gb_Executable_add_linked_static_libs,soffice,\
diff --git a/desktop/Executable_unopkg.mk b/desktop/Executable_unopkg.mk
index f68ec85c27fc..3703f8cd8639 100644
--- a/desktop/Executable_unopkg.mk
+++ b/desktop/Executable_unopkg.mk
@@ -38,10 +38,6 @@ $(eval $(call gb_Executable_add_linked_static_libs,unopkg,\
     ooopathutils \
 ))
 
-$(eval $(call gb_Executable_add_linked_libs,unopkg,\
-    user32 \
-))
-
 $(eval $(call gb_Executable_add_noexception_objects,unopkg,\
     desktop/win32/source/extendloaderenvironment \
     desktop/win32/source/guiloader/genericloader \
-- 
cgit