diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-10-02 14:13:40 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2012-10-03 16:56:06 +0100 |
| commit | c4008ef54630b560792aa288437db1179ad96095 (patch) | |
| tree | 53a568a3d143490a341fe546bb08438d59e35ac6 /toolkit/Module_toolkit.mk | |
| parent | 258548ca8116a233e91900709ed7ce7ef1804ecd (diff) | |
re-base on ALv2 code. Includes:
tkr41: #117828# office crash fixed . (null pointer) + add unit test
Patch contributed by Tobias Krause
http://svn.apache.org/viewvc?view=revision&revision=1172105
Do not add targets for junit tests when junit is disabled.
Patch contributed by Andre Fischer
http://svn.apache.org/viewvc?view=revision&revision=1241508
remove the OutDev::GetKernPair* stubs completely
Patch contributed by Herbert Duerr
http://svn.apache.org/viewvc?view=revision&revision=1179221
reverting un-necessary OS/2 conditionals.
Diffstat (limited to 'toolkit/Module_toolkit.mk')
| -rw-r--r-- | toolkit/Module_toolkit.mk | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/toolkit/Module_toolkit.mk b/toolkit/Module_toolkit.mk index dc83aad16f2d..7fba5fd7e5ac 100644 --- a/toolkit/Module_toolkit.mk +++ b/toolkit/Module_toolkit.mk @@ -1,30 +1,21 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -#************************************************************************* # -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# This file is part of the LibreOffice project. # -# OpenOffice.org - a multi-platform office productivity suite +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# This file is part of OpenOffice.org. +# This file incorporates work covered by the following license notice: # -# 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. +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed +# with this work for additional information regarding copyright +# ownership. The ASF licenses this file to you under the Apache +# License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 . # -# 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. -# -#************************************************************************* $(eval $(call gb_Module_Module,toolkit)) @@ -34,9 +25,11 @@ $(eval $(call gb_Module_add_targets,toolkit,\ Package_inc \ )) +ifneq ($(OOO_JUNIT_JAR),) $(eval $(call gb_Module_add_subsequentcheck_targets,toolkit,\ JunitTest_toolkit_complex \ JunitTest_toolkit_unoapi \ )) +endif # vim: set noet sw=4 ts=4: |