diff options
92 files changed, 304 insertions, 259 deletions
diff --git a/GNUmakefile.mk b/GNUmakefile.mk index e190825b05ae..6d613a6b4971 100644 --- a/GNUmakefile.mk +++ b/GNUmakefile.mk @@ -27,11 +27,12 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ./solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/solenv/gbuild/source_and_rerun.mk +else +include $(SOLARENV)/gbuild/gbuild.mk +$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) endif -include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(wildcard $(SRCDIR)/RepositoryModule_*.mk))) # vim: set noet sw=4 ts=4: diff --git a/MathMLDTD/Makefile b/MathMLDTD/Makefile index 78def2598caa..f9ac01ef0747 100644 --- a/MathMLDTD/Makefile +++ b/MathMLDTD/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/Mesa/Makefile b/Mesa/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/Mesa/Makefile +++ b/Mesa/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/animations/Makefile b/animations/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/animations/Makefile +++ b/animations/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/automation/Makefile b/automation/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/automation/Makefile +++ b/automation/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/avmedia/Makefile b/avmedia/Makefile index 1d161b5f7d89..f9ac01ef0747 100644 --- a/avmedia/Makefile +++ b/avmedia/Makefile @@ -1,9 +1,9 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/basctl/Makefile b/basctl/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/basctl/Makefile +++ b/basctl/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/basebmp/Makefile b/basebmp/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/basebmp/Makefile +++ b/basebmp/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/basegfx/Makefile b/basegfx/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/basegfx/Makefile +++ b/basegfx/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/basic/Makefile b/basic/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/basic/Makefile +++ b/basic/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/bean/Makefile b/bean/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/bean/Makefile +++ b/bean/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/binaryurp/Makefile b/binaryurp/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/binaryurp/Makefile +++ b/binaryurp/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/canvas/Makefile b/canvas/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/canvas/Makefile +++ b/canvas/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/chart2/Makefile b/chart2/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/chart2/Makefile +++ b/chart2/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/comphelper/Makefile b/comphelper/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/comphelper/Makefile +++ b/comphelper/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/configmgr/Makefile b/configmgr/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/configmgr/Makefile +++ b/configmgr/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/cppcanvas/Makefile b/cppcanvas/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/cppcanvas/Makefile +++ b/cppcanvas/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/cui/Makefile b/cui/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/cui/Makefile +++ b/cui/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/dbaccess/Makefile b/dbaccess/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/dbaccess/Makefile +++ b/dbaccess/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/desktop/Makefile b/desktop/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/desktop/Makefile +++ b/desktop/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/drawinglayer/Makefile b/drawinglayer/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/drawinglayer/Makefile +++ b/drawinglayer/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/dtrans/Makefile b/dtrans/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/dtrans/Makefile +++ b/dtrans/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/editeng/Makefile b/editeng/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/editeng/Makefile +++ b/editeng/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/eventattacher/Makefile b/eventattacher/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/eventattacher/Makefile +++ b/eventattacher/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/extensions/Makefile b/extensions/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/fileaccess/Makefile b/fileaccess/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/fileaccess/Makefile +++ b/fileaccess/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/filter/Makefile b/filter/Makefile index 8db1cd0dc55c..f9ac01ef0747 100644 --- a/filter/Makefile +++ b/filter/Makefile @@ -1,24 +1,33 @@ -#*************************************************************** -# 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 +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* # -# http://www.apache.org/licenses/LICENSE-2.0 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -#*************************************************************** +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# 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. +# +#************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/forms/Makefile b/forms/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/forms/Makefile +++ b/forms/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/formula/Makefile b/formula/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/formula/Makefile +++ b/formula/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/framework/Makefile b/framework/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/hwpfilter/Makefile b/hwpfilter/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/hwpfilter/Makefile +++ b/hwpfilter/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/i18npool/Makefile b/i18npool/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/i18npool/Makefile +++ b/i18npool/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/i18nutil/Makefile b/i18nutil/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/i18nutil/Makefile +++ b/i18nutil/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/idl/Makefile b/idl/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/idl/Makefile +++ b/idl/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/libcmis/Makefile b/libcmis/Makefile index 72632c764dfc..f9ac01ef0747 100644 --- a/libcmis/Makefile +++ b/libcmis/Makefile @@ -1,32 +1,33 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* # -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 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. # -# Major Contributor(s): -# Copyright (C) 2011 SUSE <cbosdonnat@suse.com> +# 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. # -# All Rights Reserved. +# 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). # -# For minor contributions see the git repository. +# 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. +#************************************************************************* -ifeq ($(strip $(SRC_ROOT)),) -include ../solenv/gbuild/source_and_rerun.mk +ifeq ($(strip $(SOLARENV)),) +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/linguistic/Makefile b/linguistic/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/linguistic/Makefile +++ b/linguistic/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/lotuswordpro/Makefile b/lotuswordpro/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/lotuswordpro/Makefile +++ b/lotuswordpro/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/o3tl/Makefile b/o3tl/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/o3tl/Makefile +++ b/o3tl/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/offapi/Makefile b/offapi/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/offapi/Makefile +++ b/offapi/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/officecfg/Makefile b/officecfg/Makefile index 8db1cd0dc55c..f9ac01ef0747 100644 --- a/officecfg/Makefile +++ b/officecfg/Makefile @@ -1,24 +1,33 @@ -#*************************************************************** -# 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 +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* # -# http://www.apache.org/licenses/LICENSE-2.0 +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -#*************************************************************** +# OpenOffice.org - a multi-platform office productivity suite +# +# This file is part of OpenOffice.org. +# +# 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. +# +#************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/oovbaapi/Makefile b/oovbaapi/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/oovbaapi/Makefile +++ b/oovbaapi/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/oox/Makefile b/oox/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/oox/Makefile +++ b/oox/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/package/Makefile b/package/Makefile index 1d161b5f7d89..f9ac01ef0747 100644 --- a/package/Makefile +++ b/package/Makefile @@ -1,9 +1,9 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/padmin/Makefile b/padmin/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/padmin/Makefile +++ b/padmin/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/psprint_config/Makefile b/psprint_config/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/psprint_config/Makefile +++ b/psprint_config/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/qadevOOo/Makefile b/qadevOOo/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/qadevOOo/Makefile +++ b/qadevOOo/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/regexp/Makefile b/regexp/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/regexp/Makefile +++ b/regexp/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/reportdesign/Makefile b/reportdesign/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/reportdesign/Makefile +++ b/reportdesign/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/rsc/Makefile b/rsc/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/rsc/Makefile +++ b/rsc/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sal/Makefile b/sal/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/sal/Makefile +++ b/sal/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sane/Makefile b/sane/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/sane/Makefile +++ b/sane/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sax/Makefile b/sax/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/sax/Makefile +++ b/sax/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sc/Makefile b/sc/Makefile index da8cc4d64a7c..f9ac01ef0747 100644 --- a/sc/Makefile +++ b/sc/Makefile @@ -1,28 +1,33 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* # -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 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. # -# 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. +# 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. +# +#************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/scaddins/Makefile b/scaddins/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/scaddins/Makefile +++ b/scaddins/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sccomp/Makefile b/sccomp/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/sccomp/Makefile +++ b/sccomp/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/scripting/Makefile b/scripting/Makefile index 1d161b5f7d89..f9ac01ef0747 100644 --- a/scripting/Makefile +++ b/scripting/Makefile @@ -1,9 +1,9 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sd/Makefile b/sd/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/sd/Makefile +++ b/sd/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sfx2/Makefile b/sfx2/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/sfx2/Makefile +++ b/sfx2/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/slideshow/Makefile b/slideshow/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/slideshow/Makefile +++ b/slideshow/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index e9065f1f8014..3003c9dbd701 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -62,7 +62,7 @@ $(call gb_JunitTest_get_target,%) : && echo "see full error log at $@.log" \ && echo "to rerun just this failed test without all others, run either:" \ && echo "cd \$$MODULE && make $@" \ - && echo "make -f ${SRCDIR}/GNUmakefile.mk $@" && false)) && \ + && echo "make -f $(SRCDIR)/GNUmakefile.mk $@" && false)) && \ rm -rf $(call gb_JunitTest_get_userdir,$*)) $(CLEAN_CMD) diff --git a/solenv/gbuild/source_and_rerun.mk b/solenv/gbuild/source_and_rerun.mk index 0de1a9ddf35f..418acc593c17 100644 --- a/solenv/gbuild/source_and_rerun.mk +++ b/solenv/gbuild/source_and_rerun.mk @@ -1,11 +1,13 @@ -dummy: - @if test -f ./config.mk; then . ./config.mk; else if test -f ../config.mk ; then . ../config.mk; fi; fi && \ - if test -f ./Env.Host.sh; then . ./Env.Host.sh; else if test -f ../Env.Host.sh; then . ../Env.Host.sh; fi ; fi && \ +gb_MAKEFILEDIR:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +source-env-and-recurse: + @if test -f $(gb_MAKEFILEDIR)/config.mk; then . $(gb_MAKEFILEDIR)/config.mk; else if test -f $(gb_MAKEFILEDIR)/../config.mk ; then . $(gb_MAKEFILEDIR)/../config.mk; fi; fi && \ + if test -f $(gb_MAKEFILEDIR)/Env.Host.sh; then . $(gb_MAKEFILEDIR)/Env.Host.sh; else if test -f $(gb_MAKEFILEDIR)/../Env.Host.sh; then . $(gb_MAKEFILEDIR)/../Env.Host.sh; fi ; fi && \ if test -z "$${SOLARENV}"; then echo "No environment set!" 2>&1; exit 1; fi && \ - $(MAKE) $(MAKECMDGOALS) + $(MAKE) -f $(firstword $(MAKEFILE_LIST)) $(MAKECMDGOALS) ifneq ($(strip $(MAKECMDGOALS)),) -$(eval $(MAKECMDGOALS) : dummy) +$(eval $(MAKECMDGOALS) : source-env-and-recurse) endif diff --git a/solenv/gbuild/templates/Makefile b/solenv/gbuild/templates/Makefile index 78def2598caa..f9ac01ef0747 100644 --- a/solenv/gbuild/templates/Makefile +++ b/solenv/gbuild/templates/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sot/Makefile b/sot/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/sot/Makefile +++ b/sot/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/starmath/Makefile b/starmath/Makefile index da8cc4d64a7c..f9ac01ef0747 100644 --- a/starmath/Makefile +++ b/starmath/Makefile @@ -1,28 +1,33 @@ # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +#************************************************************************* # -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +# +# Copyright 2000, 2010 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. # -# 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. +# 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. +# +#************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/svl/Makefile b/svl/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/svl/Makefile +++ b/svl/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/svtools/Makefile b/svtools/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/svtools/Makefile +++ b/svtools/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/svx/Makefile b/svx/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/svx/Makefile +++ b/svx/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/sw/Makefile b/sw/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/sw/Makefile +++ b/sw/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/swext/Makefile b/swext/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/swext/Makefile +++ b/swext/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/tail_build/Makefile b/tail_build/Makefile index 92241b5c70f4..f9ac01ef0747 100644 --- a/tail_build/Makefile +++ b/tail_build/Makefile @@ -1,8 +1,9 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2009 by Sun Microsystems, Inc. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -25,14 +26,14 @@ # #************************************************************************* -# if no environment is set, try to find one, source it and re-exec ifeq ($(strip $(SOLARENV)),) -include ./solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else +gb_PARTIALBUILD := T include $(SOLARENV)/gbuild/gbuild.mk -$(eval $(call gb_Module_make_global_targets,$(SRC_ROOT)/Module_tail_build.mk)) +$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk))) endif # vim: set noet sw=4 ts=4: diff --git a/testautomation/Makefile b/testautomation/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/testautomation/Makefile +++ b/testautomation/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/toolkit/Makefile b/toolkit/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/toolkit/Makefile +++ b/toolkit/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/tools/Makefile b/tools/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/twain/Makefile b/twain/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/twain/Makefile +++ b/twain/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/ucb/Makefile b/ucb/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/ucb/Makefile +++ b/ucb/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/ucbhelper/Makefile b/ucbhelper/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/ucbhelper/Makefile +++ b/ucbhelper/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/udkapi/Makefile b/udkapi/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/udkapi/Makefile +++ b/udkapi/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/unixODBC/Makefile b/unixODBC/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/unixODBC/Makefile +++ b/unixODBC/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/unotools/Makefile b/unotools/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/unotools/Makefile +++ b/unotools/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/unoxml/Makefile b/unoxml/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/unoxml/Makefile +++ b/unoxml/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/uui/Makefile b/uui/Makefile index 5742d9f11d07..f9ac01ef0747 100644 --- a/uui/Makefile +++ b/uui/Makefile @@ -2,7 +2,7 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/vbahelper/Makefile b/vbahelper/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/vbahelper/Makefile +++ b/vbahelper/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/vcl/Makefile b/vcl/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/vcl/Makefile +++ b/vcl/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/wizards/Makefile b/wizards/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/wizards/Makefile +++ b/wizards/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/writerfilter/Makefile b/writerfilter/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/writerfilter/Makefile +++ b/writerfilter/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/writerperfect/Makefile b/writerperfect/Makefile index 798b507deb12..f9ac01ef0747 100644 --- a/writerperfect/Makefile +++ b/writerperfect/Makefile @@ -2,8 +2,8 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2011 Oracle and/or its affiliates. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/xmerge/Makefile b/xmerge/Makefile index 3080611e6c49..f9ac01ef0747 100644 --- a/xmerge/Makefile +++ b/xmerge/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/xml2cmp/Makefile b/xml2cmp/Makefile index 78def2598caa..f9ac01ef0747 100644 --- a/xml2cmp/Makefile +++ b/xml2cmp/Makefile @@ -1,8 +1,9 @@ +# -*- 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. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -26,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/xmloff/Makefile b/xmloff/Makefile index d3daec86907e..f9ac01ef0747 100644 --- a/xmloff/Makefile +++ b/xmloff/Makefile @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/xmlreader/Makefile b/xmlreader/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/xmlreader/Makefile +++ b/xmlreader/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/xmlscript/Makefile b/xmlscript/Makefile index 778d12f600b7..f9ac01ef0747 100644 --- a/xmlscript/Makefile +++ b/xmlscript/Makefile @@ -3,7 +3,7 @@ # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # -# Copyright 2000, 2011 Oracle and/or its affiliates. +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T diff --git a/xmlsecurity/Makefile b/xmlsecurity/Makefile index 1d161b5f7d89..f9ac01ef0747 100644 --- a/xmlsecurity/Makefile +++ b/xmlsecurity/Makefile @@ -1,9 +1,9 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# -*- 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. +# +# Copyright 2000, 2010 Oracle and/or its affiliates. # # OpenOffice.org - a multi-platform office productivity suite # @@ -27,7 +27,7 @@ #************************************************************************* ifeq ($(strip $(SOLARENV)),) -include ../solenv/gbuild/source_and_rerun.mk +include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk else gb_PARTIALBUILD := T |