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_xo.mk | |
| parent | 5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff) | |
| parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'xmloff/Library_xo.mk')
| -rw-r--r-- | xmloff/Library_xo.mk | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/xmloff/Library_xo.mk b/xmloff/Library_xo.mk index 2e335b4175c4..9576341f0ffb 100644 --- a/xmloff/Library_xo.mk +++ b/xmloff/Library_xo.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. # @@ -36,12 +36,10 @@ $(eval $(call gb_Library_add_precompiled_header,xo,$(SRCDIR)/xmloff/inc/pch/prec $(eval $(call gb_Library_set_include,xo,\ $$(SOLARINC) \ -I. \ - -I$(WORKDIR)/inc/ \ -I$(SRCDIR)/xmloff/inc \ -I$(SRCDIR)/xmloff/source/inc \ -I$(SRCDIR)/xmloff/inc/pch \ -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ )) $(eval $(call gb_Library_set_defs,xo,\ @@ -61,12 +59,14 @@ $(eval $(call gb_Library_add_linked_libs,xo,\ tl \ utl \ vos3 \ + $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/chart/ColorPropertySet \ xmloff/source/chart/PropertyMaps \ xmloff/source/chart/SchXMLAutoStylePoolP \ + xmloff/source/chart/SchXMLAxisContext \ xmloff/source/chart/SchXMLCalculationSettingsContext \ xmloff/source/chart/SchXMLChartContext \ xmloff/source/chart/SchXMLExport \ @@ -380,22 +380,4 @@ $(eval $(call gb_Library_add_exception_objects,xo,\ xmloff/source/xforms/xformsimport \ )) -ifeq ($(OS),LINUX) -$(eval $(call gb_Library_add_linked_libs,xo,\ - dl \ - icuuc \ - m \ - pthread \ -)) -endif - -ifeq ($(OS),WNT) -$(eval $(call gb_Library_add_linked_libs,xo,\ - kernel32 \ - msvcrt \ - oldnames \ - user32 \ - uwinapi \ -)) -endif # vim: set noet ts=4 sw=4: |