diff options
Diffstat (limited to 'xmloff/Library_xof.mk')
| -rw-r--r-- | xmloff/Library_xof.mk | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index e809935d12ba..455daadaf6e3 100644 --- a/xmloff/Library_xof.mk +++ b/xmloff/Library_xof.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. # @@ -33,9 +33,7 @@ $(eval $(call gb_Library_set_include,xof,\ -I$(SRCDIR)/xmloff/inc/pch \ -I$(SRCDIR)/xmloff/inc \ -I$(SRCDIR)/xmloff/source/inc \ - -I$(WORKDIR)/inc/ \ $$(INCLUDE) \ - -I$(OUTDIR)/inc \ -I$(OUTDIR)/inc/offuh \ )) @@ -47,6 +45,7 @@ $(eval $(call gb_Library_add_linked_libs,xof,\ salhelper \ stl \ xo \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xof,\ @@ -91,37 +90,4 @@ $(eval $(call gb_Library_add_exception_objects,xof,\ xmloff/source/transform/XMLFilterRegistration \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xof,\ - icuuc \ - dl \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -ifneq ($(USE_MINGW),) -$(eval $(call gb_Library_add_linked_libs,xof,\ - mingwthrd \ - $(gb_MINGW_LIBSTDCPP) \ - mingw32 \ - $(gb_MINGW_LIBGCC) \ - uwinapi \ - moldname \ - mingwex \ - kernel32 \ - msvcrt \ - user32 \ -)) -else -$(eval $(call gb_Library_add_linked_libs,xof,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif -endif # vim: set noet ts=4 sw=4: |