diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-20 09:48:41 +0200 |
commit | 2850da4f8cab294b2f897d170b35ec532e3c4d49 (patch) | |
tree | 549908e5c5b1d28ba2a6a37369201079c1209a5b /starmath/Library_sm.mk | |
parent | 457fe4e7e83a0fed70a07ddeb2158e02ff1bca7e (diff) | |
parent | 5f03f0c86933b1372a96d05018610205bbd43db9 (diff) |
Merge branch 'master' into feature/gnumake4
Conflicts:
starmath/JunitTest_sm_unoapi.mk
starmath/Library_sm.mk
starmath/Library_smd.mk
starmath/Makefile
starmath/prj/build.lst
starmath/prj/makefile.mk
starmath/qa/unoapi/Test.java
starmath/source/detreg.cxx
starmath/source/register.cxx
starmath/source/smdetect.cxx
sw/Library_sw.mk
sw/Library_swd.mk
sw/Library_swui.mk
sw/Library_vbaswobj.mk
sw/inc/iodetect.hxx
sw/inc/swddllapi.h
sw/source/filter/basflt/iodetect.cxx
Diffstat (limited to 'starmath/Library_sm.mk')
-rw-r--r-- | starmath/Library_sm.mk | 149 |
1 files changed, 76 insertions, 73 deletions
diff --git a/starmath/Library_sm.mk b/starmath/Library_sm.mk index 78648e025bd4..c1c03aa0e576 100644 --- a/starmath/Library_sm.mk +++ b/starmath/Library_sm.mk @@ -1,29 +1,23 @@ -#************************************************************************* +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ # -# OpenOffice.org - a multi-platform office productivity suite +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. # -# This file is part of OpenOffice.org. +# The Initial Developer of the Original Code is +# Norbert Thiebaud <nthiebaud@gmail.com> (C) 2010, All Rights Reserved. # -# 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 -# <http://www.openoffice.org/license.html> -# for a copy of the LGPLv3 License. -# -#************************************************************************* +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. $(eval $(call gb_Library_Library,sm)) @@ -34,71 +28,80 @@ $(eval $(call gb_Library_add_precompiled_header,sm,$(SRCDIR)/starmath/inc/pch/pr $(eval $(call gb_Library_set_componentfile,sm,starmath/util/sm)) $(eval $(call gb_Library_set_include,sm,\ - -I$(SRCDIR)/starmath/inc/pch \ - -I$(SRCDIR)/starmath/inc \ - -I$(WORKDIR)/SdiTarget/starmath/sdi \ - $$(INCLUDE) \ - -I$(OUTDIR)/inc/offuh \ - -I$(OUTDIR)/inc \ + -I$(realpath $(SRCDIR)/starmath/inc/pch) \ + -I$(realpath $(SRCDIR)/starmath/inc) \ + -I$(WORKDIR)/SdiTarget/starmath/sdi \ + -I$(WORKDIR)/Misc/starmath/ \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc/offuh \ + -I$(OUTDIR)/inc \ +)) + +$(eval $(call gb_Library_add_defs,sm,\ + -DSMDLL \ + -DSC_INFO_OSVERSION=\"$(OS)\" \ )) $(eval $(call gb_Library_add_linked_libs,sm,\ - comphelper \ - cppu \ - cppuhelper \ - editeng \ + comphelper \ + cppu \ + cppuhelper \ + editeng \ i18npaper \ - sal \ - sfx \ - sot \ - stl \ - svl \ - svt \ - svx \ - svxcore \ - tk \ - tl \ - utl \ - vcl \ + sal \ + sfx \ + sot \ + svl \ + svt \ + svx \ + svxcore \ + tk \ + tl \ + utl \ + vcl \ + ucbhelper \ xo \ - $(gb_STDLIBS) \ )) $(eval $(call gb_Library_add_exception_objects,sm,\ - starmath/source/accessibility \ - starmath/source/action \ - starmath/source/cfgitem \ - starmath/source/config \ - starmath/source/dialog \ - starmath/source/document \ - starmath/source/edit \ - starmath/source/eqnolefilehdr \ - starmath/source/format \ - starmath/source/mathmlexport \ - starmath/source/mathmlimport \ - starmath/source/mathtype \ - starmath/source/node \ - starmath/source/parse \ - starmath/source/rect \ - starmath/source/register \ + starmath/source/accessibility \ + starmath/source/action \ + starmath/source/caret \ + starmath/source/cfgitem \ + starmath/source/config \ + starmath/source/cursor \ + starmath/source/dialog \ + starmath/source/document \ + starmath/source/edit \ + starmath/source/format \ + starmath/source/mathmlexport \ + starmath/source/mathmlimport \ + starmath/source/mathtype \ + starmath/source/node \ + starmath/source/parse \ + starmath/source/rect \ + starmath/source/register \ starmath/source/smdll \ - starmath/source/smmod \ - starmath/source/symbol \ - starmath/source/toolbox \ - starmath/source/typemap \ - starmath/source/types \ - starmath/source/unodoc \ - starmath/source/unomodel \ - starmath/source/utility \ - starmath/source/view \ + starmath/source/smmod \ + starmath/source/symbol \ + starmath/source/toolbox \ + starmath/source/typemap \ + starmath/source/types \ + starmath/source/unodoc \ + starmath/source/unomodel \ + starmath/source/utility \ + starmath/source/view \ + starmath/source/visitors \ )) + $(eval $(call gb_SdiTarget_SdiTarget,starmath/sdi/smslots,starmath/sdi/smath)) $(eval $(call gb_SdiTarget_set_include,starmath/sdi/smslots,\ - -I$(SRCDIR)/starmath/inc \ - -I$(SRCDIR)/starmath/sdi \ - $$(INCLUDE) \ + -I$(realpath $(SRCDIR)/starmath/inc) \ + -I$(realpath $(SRCDIR)/starmath/sdi) \ + $$(INCLUDE) \ + -I$(OUTDIR)/inc \ )) # vim: set noet sw=4 ts=4: |