From f51c9e5db1b84ce92bb75d3a5faf6ebe9ef5dcc9 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 26 Jun 2010 01:29:37 +0200 Subject: CWS gnumake2: module reorg --- svl/Library_passwordcontainer.mk | 72 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 svl/Library_passwordcontainer.mk (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk new file mode 100644 index 000000000000..4285efa53a0b --- /dev/null +++ b/svl/Library_passwordcontainer.mk @@ -0,0 +1,72 @@ +#************************************************************************* +# +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2009 by Sun Microsystems, Inc. +# +# 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 +# +# for a copy of the LGPLv3 License. +# +#************************************************************************* + +$(eval $(call gb_Library_Library,passwordcontainer)) + +$(eval $(call gb_Library_set_include,passwordcontainer,\ + $$(SOLARINC) \ + -I$(WORKDIR)/inc/svl \ + -I$(WORKDIR)/inc/ \ + -I$(SRCDIR)/svl/inc \ + -I$(SRCDIR)/svl/inc/svl \ + -I$(SRCDIR)/svl/source/inc \ + -I$(SRCDIR)/svl/inc/pch \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + utl \ + ucbhelper \ + cppuhelper \ + cppu \ + sal \ + stl \ +)) + +$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\ + icuuc \ + dl \ + m \ + pthread \ +)) + +$(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ + svl/source/passwordcontainer/passwordcontainer \ + svl/source/passwordcontainer/syscreds \ +)) + +ifeq ($(OS),WNT) +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + kernel32 \ + msvcrt \ + oldnames \ + user32 \ + uwinapi \ +)) +endif +# vim: set noet sw=4 ts=4: -- cgit From 245e3ab75fd3aa3dd557dab37e9691f33bd023b1 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Sat, 6 Nov 2010 15:58:44 +0100 Subject: gnumake2: added component registration --- svl/Library_passwordcontainer.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 4285efa53a0b..fc602ef048ad 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -27,6 +27,8 @@ $(eval $(call gb_Library_Library,passwordcontainer)) +$(eval $(call gb_Library_set_componentfile,passwordcontainer,svl/source/passwordcontainer/passwordcontainer)) + $(eval $(call gb_Library_set_include,passwordcontainer,\ $$(SOLARINC) \ -I$(WORKDIR)/inc/svl \ -- cgit From d2e5e59c6b28235a832cdc06480e30f0ed96b580 Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Fri, 26 Nov 2010 13:37:22 +0100 Subject: gnumake2: sorting all lists in makefiles --- svl/Library_passwordcontainer.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index fc602ef048ad..d0b35552e18a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -42,12 +42,12 @@ $(eval $(call gb_Library_set_include,passwordcontainer,\ )) $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - utl \ - ucbhelper \ - cppuhelper \ cppu \ + cppuhelper \ sal \ stl \ + ucbhelper \ + utl \ )) $(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\ -- cgit From e389e3aef4fddf06a0e1e902802ad00f2e60905f Mon Sep 17 00:00:00 2001 From: tono Date: Fri, 31 Dec 2010 00:35:16 +0900 Subject: i#116264: gbuild for MinGW --- svl/Library_passwordcontainer.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d0b35552e18a..a0fbe88be93d 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -63,6 +63,20 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ )) ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ kernel32 \ msvcrt \ @@ -71,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: -- cgit From 719a761b4f8e71a5cf86d5c92bff0cb44be612c7 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 21:38:47 +0900 Subject: Backed out changeset: e84942bd0aca --- svl/Library_passwordcontainer.mk | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index a0fbe88be93d..d0b35552e18a 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -63,20 +63,6 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ )) ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ kernel32 \ msvcrt \ @@ -85,5 +71,4 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ uwinapi \ )) endif -endif # vim: set noet sw=4 ts=4: -- cgit From 93d8027d3dc7d52fb96325601ee35562560c68d5 Mon Sep 17 00:00:00 2001 From: tono Date: Wed, 5 Jan 2011 22:55:15 +0900 Subject: mingwport33: i#116264: gbuild for MinGW --- svl/Library_passwordcontainer.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d0b35552e18a..a0fbe88be93d 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -63,6 +63,20 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ )) ifeq ($(OS),WNT) +ifneq ($(USE_MINGW),) +$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ + mingwthrd \ + $(gb_MINGW_LIBSTDCPP) \ + mingw32 \ + $(gb_MINGW_LIBGCC) \ + uwinapi \ + moldname \ + mingwex \ + kernel32 \ + msvcrt \ + user32 \ +)) +else $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ kernel32 \ msvcrt \ @@ -71,4 +85,5 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ uwinapi \ )) endif +endif # vim: set noet sw=4 ts=4: -- cgit From 38ea83b7b499f2867fd37b113d5ffaa84326016c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 25 Jan 2011 18:19:55 +0100 Subject: CWS gnumake3: fix license headers --- svl/Library_passwordcontainer.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index d0b35552e18a..7a0dbcc2babe 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.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 # # for a copy of the LGPLv3 License. # -- cgit From f7d5dd5f78289e1e0934d45262debd532432394f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 1 Feb 2011 18:44:12 +0100 Subject: CWS gnumake3: use standard linked libs on Windows --- svl/Library_passwordcontainer.mk | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 654f394f6176..50fc8be48012 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -48,13 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ stl \ ucbhelper \ utl \ -)) - -$(eval $(call gb_Library_add_linked_system_libs,passwordcontainer,\ - icuuc \ - dl \ - m \ - pthread \ + $(gb_StdLibs) \ )) $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ @@ -70,20 +64,11 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ mingw32 \ $(gb_MINGW_LIBGCC) \ uwinapi \ - moldname \ mingwex \ kernel32 \ msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ )) endif endif + # vim: set noet sw=4 ts=4: -- cgit From 582eb5a368de1627164bc50e25f9eab8ae96e1a8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer 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 --- svl/Library_passwordcontainer.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index 50fc8be48012..e17004cff265 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ stl \ ucbhelper \ utl \ - $(gb_StdLibs) \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ -- cgit From ec283a532c1a30270f41f3f57c6c0ff3612a11d3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 3 Feb 2011 10:24:18 +0100 Subject: CWS gnumake3: clean up mingw stuff after adding STDLIBS --- svl/Library_passwordcontainer.mk | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'svl/Library_passwordcontainer.mk') diff --git a/svl/Library_passwordcontainer.mk b/svl/Library_passwordcontainer.mk index e17004cff265..08acae0930ec 100644 --- a/svl/Library_passwordcontainer.mk +++ b/svl/Library_passwordcontainer.mk @@ -56,19 +56,4 @@ $(eval $(call gb_Library_add_exception_objects,passwordcontainer,\ svl/source/passwordcontainer/syscreds \ )) -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,passwordcontainer,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - kernel32 \ - msvcrt \ -)) -endif -endif - # vim: set noet sw=4 ts=4: -- cgit