From 80fa6e0c97fc50fee714f3a7dc75d11d2180877b Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Tue, 25 Jan 2011 18:19:55 +0100
Subject: CWS gnumake3: fix license headers

---
 framework/Library_fwi.mk | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/Library_fwi.mk')

diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 568f0a1eb22a..79aa63cb4fa9 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -2,7 +2,7 @@
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
-# Copyright 2009 by Sun Microsystems, Inc.
+# Copyright 2000, 2011 Oracle and/or its affiliates.
 #
 # OpenOffice.org - a multi-platform office productivity suite
 #
@@ -14,12 +14,12 @@
 #
 # 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
+# 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
+# version 3 along with OpenOffice.org.  If not, see
 # <http://www.openoffice.org/license.html>
 # for a copy of the LGPLv3 License.
 #
-- 
cgit 


From 2e98dd0232e6f593998060844c50851a54bd3cef Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Tue, 1 Feb 2011 18:44:12 +0100
Subject: CWS gnumake3: use standard linked libs on Windows

---
 framework/Library_fwi.mk | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'framework/Library_fwi.mk')

diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index 1ba9d9fda79a..e510768700be 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -58,6 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     utl \
     vcl \
     vos3 \
+    $(gb_StdLibs) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwi,\
@@ -91,21 +92,14 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     mingw32 \
     $(gb_MINGW_LIBGCC) \
     uwinapi \
-    moldname \
     mingwex \
     advapi32 \
     kernel32 \
     msvcrt \
-    unicows \
 ))
 else
 $(eval $(call gb_Library_add_linked_libs,fwi,\
     advapi32 \
-    kernel32 \
-    msvcrt \
-    stl \
-    unicows \
-    uwinapi \
 ))
 endif
 endif
-- 
cgit 


From ab451ff91e394a5f756558a9b27b39b55c43f075 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Wed, 2 Feb 2011 17:05:04 +0100
Subject: CWS gnumake3: rename gb_StdLibs -> gb_STDLIBS; remove explicit
 linking of individual standard libs from makefiles; fix export problem in
 framework

---
 framework/Library_fwi.mk | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'framework/Library_fwi.mk')

diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index e510768700be..fc60fdf15564 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -58,7 +58,7 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
     utl \
     vcl \
     vos3 \
-    $(gb_StdLibs) \
+    $(gb_STDLIBS) \
 ))
 
 $(eval $(call gb_Library_add_exception_objects,fwi,\
@@ -77,13 +77,6 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
     framework/source/fwi/uielement/rootitemcontainer \
 ))
 
-ifeq ($(OS),LINUX)
-$(eval $(call gb_Library_add_linked_libs,fwi,\
-    dl \
-    m \
-    pthread \
-))
-endif
 ifeq ($(OS),WNT)
 ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,fwi,\
@@ -103,5 +96,5 @@ $(eval $(call gb_Library_add_linked_libs,fwi,\
 ))
 endif
 endif
-# TODO: visibility
+
 # vim: set noet sw=4 ts=4:
-- 
cgit 


From 1851104998e0996874dbebccbfbd4778848f1f17 Mon Sep 17 00:00:00 2001
From: Mathias Bauer <mba@openoffice.org>
Date: Thu, 3 Feb 2011 10:24:18 +0100
Subject: CWS gnumake3: clean up mingw stuff after adding STDLIBS

---
 framework/Library_fwi.mk | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'framework/Library_fwi.mk')

diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk
index fc60fdf15564..046c7230e35f 100644
--- a/framework/Library_fwi.mk
+++ b/framework/Library_fwi.mk
@@ -78,23 +78,9 @@ $(eval $(call gb_Library_add_exception_objects,fwi,\
 ))
 
 ifeq ($(OS),WNT)
-ifneq ($(USE_MINGW),)
 $(eval $(call gb_Library_add_linked_libs,fwi,\
-    mingwthrd \
-    $(gb_MINGW_LIBSTDCPP) \
-    mingw32 \
-    $(gb_MINGW_LIBGCC) \
-    uwinapi \
-    mingwex \
     advapi32 \
-    kernel32 \
-    msvcrt \
 ))
-else
-$(eval $(call gb_Library_add_linked_libs,fwi,\
-    advapi32 \
-))
-endif
 endif
 
 # vim: set noet sw=4 ts=4:
-- 
cgit