update makefiles

6 files changed, 12 insertions, 210 deletions

diff --git a/javaunohelper/Makefile b/javaunohelper/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/javaunohelper/Makefile
+++ b/javaunohelper/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_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/jurt/Makefile b/jurt/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/jurt/Makefile
+++ b/jurt/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_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/jvmaccess/Makefile b/jvmaccess/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/jvmaccess/Makefile
+++ b/jvmaccess/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_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/jvmfwk/Makefile b/jvmfwk/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/jvmfwk/Makefile
+++ b/jvmfwk/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_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/ridljar/Makefile b/ridljar/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/ridljar/Makefile
+++ b/ridljar/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_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/unoil/Makefile b/unoil/Makefile
index 7bbbe6c703e6..ccb1c85a04da 100644
--- a/unoil/Makefile
+++ b/unoil/Makefile
@@ -1,40 +1,7 @@
 # -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#*************************************************************************
-#
-# 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
-#
-# 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.
-#
-#*************************************************************************
 
-gb_PARTIALBUILD := T
-ifeq ($(strip $(SOLARENV)),)
-include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
-else
+module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-gb_SourceEnvAndRecurse_STAGE=gbuild
-include $(SOLARENV)/gbuild/gbuild.mk
+include $(module_directory)/../solenv/gbuild/partial_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: