diff options
Diffstat (limited to 'svl/Library_svl.mk')
| -rw-r--r-- | svl/Library_svl.mk | 43 |
1 files changed, 5 insertions, 38 deletions
diff --git a/svl/Library_svl.mk b/svl/Library_svl.mk index 5181983b8bc1..0ad3ecc4aa87 100644 --- a/svl/Library_svl.mk +++ b/svl/Library_svl.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. # @@ -35,13 +35,9 @@ $(eval $(call gb_Library_set_componentfile,svl,svl/util/svl)) $(eval $(call gb_Library_set_include,svl,\ $$(SOLARINC) \ - -I$(WORKDIR)/inc/svl \ - -I$(WORKDIR)/inc/ \ - -I$(SRCDIR)/svl/inc \ -I$(SRCDIR)/svl/source/inc \ -I$(SRCDIR)/svl/inc/pch \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,svl,\ @@ -64,16 +60,9 @@ $(eval $(call gb_Library_add_linked_libs,svl,\ ucbhelper \ utl \ vos3 \ + $(gb_STDLIBS) \ )) -$(eval $(call gb_Library_add_linked_system_libs,svl,\ - dl \ - icuuc \ - m \ - pthread \ -)) - - $(eval $(call gb_Library_add_exception_objects,svl,\ svl/inc/pch/precompiled_svl \ svl/source/config/asiancfg \ @@ -169,32 +158,10 @@ $(eval $(call gb_Library_add_exception_objects,svl,\ svl/source/svdde/ddewrap \ )) -ifneq ($(USE_MINGW),) $(eval $(call gb_Library_add_linked_libs,svl,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - mingwex \ - advapi32 \ - kernel32 \ - gdi32 \ - msvcrt \ - shell32 \ user32 \ )) -else -$(eval $(call gb_Library_add_linked_libs,svl,\ - advapi32 \ - kernel32 \ - gdi32 \ - msvcrt \ - shell32 \ - user32 \ - uwinapi \ -)) -endif + else $(eval $(call gb_Library_add_exception_objects,svl,\ svl/unx/source/svdde/ddedummy \ |