diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 16:17:22 +0100 |
| commit | 1fb042333fe6287756ff1fac11d18cd7c150730d (patch) | |
| tree | 595de5d187177832ce656d7832af9dce9dce2d99 /xmloff/Library_xof.mk | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'xmloff/Library_xof.mk')
| -rw-r--r-- | xmloff/Library_xof.mk | 27 |
1 files changed, 4 insertions, 23 deletions
diff --git a/xmloff/Library_xof.mk b/xmloff/Library_xof.mk index 6880eb1a1fd9..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,22 +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) -$(eval $(call gb_Library_add_linked_libs,xof,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif # vim: set noet ts=4 sw=4: |