[Libreoffice-commits] .: 51 commits - javaunohelper/com javaunohelper/cppumaker javaunohelper/inc javaunohelper/Jar_juh.mk javaunohelper/Library_juh.mk javaunohelper/Library_juhx.mk javaunohelper/Makefile javaunohelper/Module_javaunohelper.mk javaunohelper/Package_cppumaker.mk javaunohelper/prj javaunohelper/source javaunohelper/test javaunohelper/util javaunohelper/Zip_juh.mk jurt/com jurt/Jar_jurt.mk jurt/JunitTest_bridgefactory.mk jurt/JunitTest_connections.mk jurt/JunitTest_java.mk jurt/JunitTest_java_remote.mk jurt/JunitTest_remote.mk jurt/JunitTest_uno.mk jurt/JunitTest_urp.mk jurt/JunitTest_util.mk jurt/Library_jpipe.mk jurt/Library_jpipx.mk jurt/Makefile jurt/Module_jurt.mk jurt/Package_jnilib.mk jurt/Package_test_urp.mk jurt/prj jurt/source jurt/test jurt/util jurt/Zip_jurt.mk jvmaccess/inc jvmaccess/Library_jvmaccess.mk jvmaccess/Makefile jvmaccess/Module_jvmaccess.mk jvmaccess/Package_inc.mk jvmaccess/prj jvmaccess/source jvmaccess/util jvmfwk/distributions jvmfwk/Executable_ja valdx.mk jvmfwk/inc jvmfwk/Library_jvmfwk.mk jvmfwk/Library_sunjavaplugin.mk jvmfwk/Makefile jvmfwk/Module_jvmfwk.mk jvmfwk/Package_inc.mk jvmfwk/Package_javavendors.mk jvmfwk/Package_jreproperties.mk jvmfwk/Package_rcfiles.mk jvmfwk/plugins jvmfwk/prj jvmfwk/source odk/pack postprocess/rebase RepositoryExternal.mk Repository.mk RepositoryModule_ooo.mk ridljar/com ridljar/Jar_ridl.mk ridljar/Jar_unoloader.mk ridljar/javamaker ridljar/JunitTest_typedesc.mk ridljar/JunitTest_uno.mk ridljar/JunitTest_util.mk ridljar/Makefile ridljar/Module_ridljar.mk ridljar/Package_javamaker.mk ridljar/prj ridljar/source ridljar/test ridljar/util ridljar/Zip_ridl.mk ridljar/Zip_unoloader.mk scp2/source solenv/bin solenv/gbuild unoil/climaker unoil/com unoil/drafts unoil/Jar_unoil.mk unoil/javamaker unoil/Makefile unoil/Module_unoil.mk unoil/Package_climaker.mk unoil/Package_clioootypesversion.mk unoil/Package_javamaker.mk unoil/prj unoil/util ure/source

David Tardon dtardon at kemper.freedesktop.org
Thu Feb 16 23:35:29 PST 2012


 Repository.mk                                                       |   24 +
 RepositoryExternal.mk                                               |   23 +
 RepositoryModule_ooo.mk                                             |    6 
 javaunohelper/Jar_juh.mk                                            |   69 +++++
 javaunohelper/Library_juh.mk                                        |   52 +++
 javaunohelper/Library_juhx.mk                                       |   54 ++++
 javaunohelper/Makefile                                              |    7 
 javaunohelper/Module_javaunohelper.mk                               |   40 ++
 javaunohelper/Package_cppumaker.mk                                  |   37 ++
 javaunohelper/Zip_juh.mk                                            |   57 ++++
 javaunohelper/com/sun/star/comp/helper/makefile.mk                  |   54 ----
 javaunohelper/com/sun/star/comp/juhtest/makefile.mk                 |   50 ---
 javaunohelper/com/sun/star/comp/makefile.mk                         |   49 ---
 javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk              |   54 ----
 javaunohelper/com/sun/star/lib/uno/helper/makefile.mk               |   49 ---
 javaunohelper/cppumaker/Makefile                                    |   61 ++++
 javaunohelper/inc/makefile.mk                                       |   39 --
 javaunohelper/prj/build.lst                                         |    9 
 javaunohelper/prj/d.lst                                             |    7 
 javaunohelper/prj/makefile.mk                                       |    1 
 javaunohelper/source/makefile.mk                                    |  134 ----------
 javaunohelper/test/com/sun/star/comp/helper/makefile.mk             |   52 ---
 javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk          |   68 -----
 javaunohelper/util/makefile.mk                                      |   58 ----
 javaunohelper/util/settings.pmk                                     |   28 --
 jurt/Jar_jurt.mk                                                    |   96 +++++++
 jurt/JunitTest_bridgefactory.mk                                     |   39 ++
 jurt/JunitTest_connections.mk                                       |   39 ++
 jurt/JunitTest_java.mk                                              |   39 ++
 jurt/JunitTest_java_remote.mk                                       |   41 +++
 jurt/JunitTest_remote.mk                                            |   45 +++
 jurt/JunitTest_uno.mk                                               |   41 +++
 jurt/JunitTest_urp.mk                                               |   48 +++
 jurt/JunitTest_util.mk                                              |   39 ++
 jurt/Library_jpipe.mk                                               |   54 ++++
 jurt/Library_jpipx.mk                                               |   39 ++
 jurt/Makefile                                                       |    7 
 jurt/Module_jurt.mk                                                 |   64 ++++
 jurt/Package_jnilib.mk                                              |   38 ++
 jurt/Package_test_urp.mk                                            |   43 +++
 jurt/Zip_jurt.mk                                                    |   87 ++++++
 jurt/com/sun/star/comp/bridgefactory/makefile.mk                    |   43 ---
 jurt/com/sun/star/comp/connections/makefile.mk                      |   43 ---
 jurt/com/sun/star/comp/loader/makefile.mk                           |   47 ---
 jurt/com/sun/star/comp/servicemanager/makefile.mk                   |   43 ---
 jurt/com/sun/star/comp/urlresolver/makefile.mk                      |   43 ---
 jurt/com/sun/star/lib/connections/pipe/makefile.mk                  |   41 ---
 jurt/com/sun/star/lib/connections/socket/makefile.mk                |   42 ---
 jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk           |   44 ---
 jurt/com/sun/star/lib/uno/environments/java/makefile.mk             |   44 ---
 jurt/com/sun/star/lib/uno/environments/remote/makefile.mk           |   50 ---
 jurt/com/sun/star/lib/uno/makefile.mk                               |   37 --
 jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk                 |   44 ---
 jurt/com/sun/star/lib/util/makefile.mk                              |   42 ---
 jurt/com/sun/star/uno/makefile.mk                                   |   52 ---
 jurt/prj/build.lst                                                  |   19 -
 jurt/prj/d.lst                                                      |    8 
 jurt/prj/makefile.mk                                                |    1 
 jurt/source/pipe/makefile.mk                                        |   58 ----
 jurt/source/pipe/wrapper/makefile.mk                                |   52 ---
 jurt/test/com/sun/star/comp/bridgefactory/makefile.mk               |   36 --
 jurt/test/com/sun/star/comp/connections/makefile.mk                 |   36 --
 jurt/test/com/sun/star/lib/uno/bridges/java_remote/makefile.mk      |   39 --
 jurt/test/com/sun/star/lib/uno/environments/java/makefile.mk        |   36 --
 jurt/test/com/sun/star/lib/uno/environments/remote/TestMessage.java |   89 ------
 jurt/test/com/sun/star/lib/uno/environments/remote/makefile.mk      |   44 ---
 jurt/test/com/sun/star/lib/uno/protocols/urp/Makefile               |   48 +++
 jurt/test/com/sun/star/lib/uno/protocols/urp/makefile.mk            |   51 ---
 jurt/test/com/sun/star/lib/util/makefile.mk                         |   36 --
 jurt/test/com/sun/star/uno/makefile.mk                              |   39 --
 jurt/test/makefile.mk                                               |   39 --
 jurt/util/Makefile                                                  |   38 ++
 jurt/util/makefile.mk                                               |   52 ---
 jurt/util/makefile.pmk                                              |   32 --
 jvmaccess/Library_jvmaccess.mk                                      |   62 ++++
 jvmaccess/Makefile                                                  |    7 
 jvmaccess/Module_jvmaccess.mk                                       |   40 ++
 jvmaccess/Package_inc.mk                                            |   35 ++
 jvmaccess/inc/jvmaccess/classpath.hxx                               |    3 
 jvmaccess/inc/jvmaccess/jvmaccessdllapi.h                           |   44 +++
 jvmaccess/inc/jvmaccess/unovirtualmachine.hxx                       |    5 
 jvmaccess/inc/jvmaccess/virtualmachine.hxx                          |    7 
 jvmaccess/prj/build.lst                                             |    3 
 jvmaccess/prj/d.lst                                                 |    8 
 jvmaccess/prj/makefile.mk                                           |    1 
 jvmaccess/source/makefile.mk                                        |   48 ---
 jvmaccess/util/cc5_solaris_sparc.map                                |   81 ------
 jvmaccess/util/gcc3.map                                             |   12 
 jvmaccess/util/makefile.mk                                          |   79 -----
 jvmaccess/util/mingw.map                                            |   71 -----
 jvmaccess/util/msvc_win32_intel.map                                 |   37 --
 jvmaccess/util/msvc_win32_x86-64.map                                |   37 --
 jvmfwk/Executable_javaldx.mk                                        |   40 ++
 jvmfwk/Library_jvmfwk.mk                                            |   67 +++++
 jvmfwk/Library_sunjavaplugin.mk                                     |   79 +++++
 jvmfwk/Makefile                                                     |    7 
 jvmfwk/Module_jvmfwk.mk                                             |   49 +++
 jvmfwk/Package_inc.mk                                               |   35 ++
 jvmfwk/Package_javavendors.mk                                       |   56 ++++
 jvmfwk/Package_jreproperties.mk                                     |   39 ++
 jvmfwk/Package_rcfiles.mk                                           |   34 ++
 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml          |    6 
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml            |   12 
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml           |    4 
 jvmfwk/distributions/OpenOfficeorg/javavendors_os2.xml              |   21 -
 jvmfwk/distributions/OpenOfficeorg/javavendors_template.xml         |    3 
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml              |    2 
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml              |    6 
 jvmfwk/distributions/OpenOfficeorg/makefile.mk                      |   63 ----
 jvmfwk/inc/jvmfwk/framework.h                                       |   45 +--
 jvmfwk/inc/jvmfwk/jvmfwkdllapi.h                                    |   44 +++
 jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h                              |   44 +++
 jvmfwk/inc/jvmfwk/vendorplugin.h                                    |    9 
 jvmfwk/inc/makefile.mk                                              |   39 --
 jvmfwk/plugins/sunmajor/javaenvsetup/makefile.mk                    |   56 ----
 jvmfwk/plugins/sunmajor/pluginlib/Makefile                          |   38 ++
 jvmfwk/plugins/sunmajor/pluginlib/makefile.mk                       |  120 --------
 jvmfwk/prj/build.lst                                                |    6 
 jvmfwk/prj/d.lst                                                    |   23 -
 jvmfwk/prj/makefile.mk                                              |    1 
 jvmfwk/source/makefile.mk                                           |   91 ------
 odk/pack/gendocu/makefile.mk                                        |    4 
 postprocess/rebase/coffbase.txt                                     |    2 
 ridljar/Jar_ridl.mk                                                 |   73 +++++
 ridljar/Jar_unoloader.mk                                            |   39 ++
 ridljar/JunitTest_typedesc.mk                                       |   39 ++
 ridljar/JunitTest_uno.mk                                            |   41 +++
 ridljar/JunitTest_util.mk                                           |   39 ++
 ridljar/Makefile                                                    |    7 
 ridljar/Module_ridljar.mk                                           |   48 +++
 ridljar/Package_javamaker.mk                                        |   37 ++
 ridljar/Zip_ridl.mk                                                 |   59 ++++
 ridljar/Zip_unoloader.mk                                            |   35 ++
 ridljar/com/makefile.mk                                             |   64 ----
 ridljar/javamaker/Makefile                                          |   39 ++
 ridljar/javamaker/makefile.mk                                       |   46 ---
 ridljar/prj/build.lst                                               |    7 
 ridljar/prj/d.lst                                                   |    4 
 ridljar/prj/makefile.mk                                             |    1 
 ridljar/source/unoloader/com/sun/star/lib/unoloader/makefile.mk     |   60 ----
 ridljar/source/unoloader/makefile.mk                                |   39 --
 ridljar/test/com/sun/star/lib/uno/typedesc/makefile.mk              |   35 --
 ridljar/test/com/sun/star/lib/util/makefile.mk                      |   36 --
 ridljar/test/com/sun/star/uno/makefile.mk                           |   38 --
 ridljar/test/makefile.mk                                            |   35 --
 ridljar/util/makefile.mk                                            |   52 ---
 scp2/source/ooo/ure.scp                                             |    2 
 solenv/bin/linkoo                                                   |    2 
 solenv/gbuild/Jar.mk                                                |   13 
 solenv/gbuild/JavaClassSet.mk                                       |   46 ++-
 solenv/gbuild/JunitTest.mk                                          |   13 
 solenv/gbuild/platform/com_GCC_defs.mk                              |    4 
 solenv/gbuild/platform/windows.mk                                   |    2 
 unoil/Jar_unoil.mk                                                  |   38 ++
 unoil/Makefile                                                      |    7 
 unoil/Module_unoil.mk                                               |   47 +++
 unoil/Package_climaker.mk                                           |   49 +++
 unoil/Package_clioootypesversion.mk                                 |   32 ++
 unoil/Package_javamaker.mk                                          |   38 ++
 unoil/climaker/Makefile                                             |   64 ++++
 unoil/climaker/makefile.mk                                          |   93 ------
 unoil/com/sun/star/deployment/ui/makefile.mk                        |   33 --
 unoil/com/sun/star/frame/status/makefile.mk                         |   35 --
 unoil/com/sun/star/graphic/makefile.mk                              |   35 --
 unoil/com/sun/star/mail/makefile.mk                                 |   35 --
 unoil/com/sun/star/media/makefile.mk                                |   35 --
 unoil/drafts/com/sun/star/frame/status/makefile.mk                  |   35 --
 unoil/javamaker/Makefile                                            |   40 ++
 unoil/javamaker/makefile.mk                                         |   47 ---
 unoil/prj/build.lst                                                 |    3 
 unoil/prj/d.lst                                                     |    5 
 unoil/prj/makefile.mk                                               |    1 
 unoil/util/makefile.mk                                              |   44 ---
 unoil/util/makefile.pmk                                             |   35 --
 ure/source/README                                                   |    4 
 175 files changed, 2911 insertions(+), 3633 deletions(-)

New commits:
commit bf16a2e0673356f8140f8e4bf6a52f3a99015f63
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Feb 17 08:09:48 2012 +0100

    update makefiles

diff --git a/javaunohelper/Makefile b/javaunohelper/Makefile
index 7bbbe6c..ccb1c85 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 7bbbe6c..ccb1c85 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 7bbbe6c..ccb1c85 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 7bbbe6c..ccb1c85 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 7bbbe6c..ccb1c85 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 7bbbe6c..ccb1c85 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:
commit 096f2b849c08dc6890b548621b9a19dd78661e6a
Merge: 00e26ba... 1443908...
Author: David Tardon <dtardon at redhat.com>
Date:   Fri Feb 17 08:34:22 2012 +0100

    merge feature/gbuild_java

diff --cc Repository.mk
index 5adc794,bde8a3c..6462d3a
--- a/Repository.mk
+++ b/Repository.mk
@@@ -102,70 -94,38 +102,78 @@@ endi
  
  endif
  
 +ifeq ($(OS),IOS)
 +
 +$(eval $(call gb_Helper_register_executables,OOO,\
 +	basegfx_cppunittester_all \
 +	basebmp_cppunittester_all \
 +    i18npool_cppunittester_all \
 +    sax_cppunittester_all \
 +	tools_cppunittester_all \
 +))
 +
 +endif
 +
+ ifneq ($(OS),MACOSX)
+ 
+ $(eval $(call gb_Helper_register_executables,UREBIN,\
+ 	javaldx \
+ ))
+ 
+ endif
+ 
 +ifeq ($(WITH_MOZILLA),YES)
 +$(eval $(call gb_Helper_register_executables,OOO,\
 +    pluginapp.bin \
 +))
  $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 -	PptImporter \
 -	adabas \
 -	adabasui \
 -	acc \
 -	agg \
 -	analysis \
 -	animcore \
 -	basctl \
 -	basebmp \
 -	canvastools \
 -	communi \
 -	date \
 -	evtatt \
 -	forui \
 -	odbc \
 -	odbcbase \
 -	officebean \
 -	oox \
 -	ooxml \
 -	sdbc \
 +    pl \
 +))
 +ifeq ($(ENABLE_NSPLUGIN),YES)
 +$(eval $(call gb_Helper_register_executables,OOO,\
 +    nsplugin \
 +))
 +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 +    npsoplugin \
 +))
 +endif
 +endif # WITH_MOZILLA
 +
 +
 +ifeq ($(OS),MACOSX)
 +
 +$(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \
 +    OOoSpotlightImporter \
 +))
 +
 +endif
 +
 +$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
 +    PptImporter \
 +    abp \
 +    adabas \
 +    adabasui \
 +    acc \
 +    agg \
 +    analysis \
 +    animcore \
 +    basctl \
 +    basebmp \
 +    bib \
 +    canvastools \
 +    communi \
 +    date \
 +    evtatt \
 +    forui \
 +    odbc \
 +    odbcbase \
 +    officebean \
 +    oox \
 +    ooxml \
 +    sdbc \
      AppleRemote \
      avmedia \
 -	avmediaQuickTime \
 +    avmediaQuickTime \
      basegfx \
      chartcontroller \
      chartmodel \
@@@ -315,60 -268,64 +323,73 @@@ $(eval $(call gb_Helper_register_librar
  endif
  
  $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+     jpipe \
+     juh \
+     juhx \
+     jvmfwk \
      sal_textenc \
+     sunjavaplugin \
 -	xmlreader \
 +    xmlreader \
  ))
  
+ ifeq ($(OS),WNT)
+ 
+ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
+     jpipx \
+ ))
+ 
+ endif
+ 
  $(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
 -	affine_uno \
 -	avmediagst \
 -	avmediawin \
 -	collator_data \
 -	deployment \
 -	deploymentgui \
 -	dict_ja \
 -	dict_zh \
 -	fileacc \
 -	index_data \
 -	java_uno_accessbridge \
 -	localedata_en \
 -	localedata_es \
 -	localedata_euro \
 -	localedata_others \
 -	log_uno \
 -	mcnttype \
 -	neon \
 -	package2 \
 +    affine_uno \
 +    avmediagst \
 +    avmediawin \
 +    cached1 \
 +    collator_data \
 +    deployment \
 +    deploymentgui \
 +    dict_ja \
 +    dict_zh \
 +    fileacc \
 +    index_data \
 +    java_uno_accessbridge \
 +    localedata_en \
 +    localedata_es \
 +    localedata_euro \
 +    localedata_others \
 +    log_uno \
 +    mcnttype \
 +    package2 \
      reg \
 -	scriptframe \
 +    scriptframe \
      sofficeapp \
 +    srtrs1 \
      store \
 -	test \
 -	unotest \
 -	textconv_dict \
 -    ucb \
 -    ucpfile \
 +    subsequenttest \
 +    test \
 +    textconv_dict \
 +    ucb1 \
 +    ucpdav1 \
 +    ucpfile1 \
 +    ucpftp1 \
 +    ucphier1 \
 +    ucppkg1 \
 +    unoexceptionprotector \
      unopkgapp \
 -	unsafe_uno \
 -	xmlsecurity \
 -	xsec_fw \
 -	xsec_xmlsec \
 -	xstor \
 -	$(if $(filter $(OS),ANDROID), \
 -		lo-bootstrap \
 -	) \
 -	$(if $(filter $(OS),WNT), \
 -		uwinapi \
 -	) \
 +    unotest \
 +    unsafe_uno \
 +    updchk \
 +    xmlsecurity \
 +    xsec_fw \
 +    xsec_xmlsec \
 +    xstor \
 +    $(if $(filter $(OS),ANDROID), \
 +        lo-bootstrap \
 +    ) \
 +    $(if $(filter $(OS),WNT), \
 +        ucpodma1 \
 +        uwinapi \
 +    ) \
  ))
  
  ifeq ($(OS),WNT)
@@@ -400,7 -352,8 +420,8 @@@ $(eval $(call gb_Helper_register_librar
  
  $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
      cppuhelper \
+     jvmaccess \
 -	purpenvhelper \
 +    purpenvhelper \
      salhelper \
  ))
  
diff --cc RepositoryExternal.mk
index d762282,88366d9..138a15b
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@@ -988,29 -901,29 +988,52 @@@ ende
  endif # SYSTEM_CURL
  
  
 +ifeq ($(SYSTEM_MOZILLA_HEADERS),YES)
 +
 +define gb_LinkTarget__use_mozilla_headers
 +$(eval $(call gb_LinkTarget_set_include,$(1),\
 +	$(MOZILLA_HEADERS_CFLAGS) \
 +	$$(INCLUDE) \
 +))
 +
 +endef
 +
 +else #!SYSTEM_MOZILLA_HEADERS
 +
 +define gb_LinkTarget__use_mozilla_headers
 +$(eval $(call gb_LinkTarget_set_include,$(1),\
 +	-I$(OUTDIR)/inc/npsdk \
 +	$$(INCLUDE) \
 +))
 +
 +endef
 +
 +endif #SYSTEM_MOZILLA_HEADERS
 +
 +
+ ifneq ($(VALGRIND_CFLAGS),)
+ 
+ define gb_LinkTarget__use_valgrind
+ $(call gb_LinkTarget_add_defs,$(1),\
+     -DHAVE_VALGRIND_H \
+ )
+ 
+ $(call gb_LinkTarget_set_include,$(1),\
+     $$(INCLUDE) \
+     $(VALGRIND_CFLAGS) \
+ )
+ 
+ endef
+ 
+ else # !VALGRIND_CFLAGS
+ 
+ define gb_LinkTarget__use_valgrind
+ 
+ endef
+ 
+ endif # VALGRIND_CFLAGS
+ 
+ 
  # MacOSX-only frameworks ############################################
  # (in alphabetical order)
  
diff --cc RepositoryModule_ooo.mk
index 8020878,00981af..9cd684b
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@@ -79,9 -75,10 +83,10 @@@ $(eval $(call gb_Module_add_moduledirs,
      package \
      padmin \
      psprint_config \
 -    qadevOOo \
      regexp \
      reportdesign \
+     ridljar \
 +    rsc \
      sal \
      salhelper \
      sane \
@@@ -108,11 -103,9 +113,12 @@@
      ucbhelper \
      udkapi \
      unixODBC \
 +    UnoControls \
+     unoil \
 +    unotest \
      unotools \
      unoxml \
 +    ure \
      uui \
      vbahelper \
      vcl \
diff --cc odk/pack/gendocu/makefile.mk
index 93bd1ae,5f9f86a..e4d8f86
--- a/odk/pack/gendocu/makefile.mk
+++ b/odk/pack/gendocu/makefile.mk
@@@ -86,24 -95,13 +86,24 @@@ $(CPP_DOCU_CLEANUP_FLAG) : $(INCLUDELIS
      @@-$(MY_DELETE_RECURSIVE) $(DESTDIRGENCPPREF)
      $(TOUCH) $@
  
 -$(CPP_DOCU_INDEX_FILE) : $(CPP_DOCU_CLEANUP_FLAG)
 -    -$(MKDIRHIER) $(@:d)        
 -    $(MY_AUTODOC) -html $(DESTDIRGENCPPREF) -name $(CPPDOCREFNAME) $(AUTODOCPARAMS)
 -    -rm $(@:d:d)$/cpp.css
 -    $(MY_TEXTCOPY) $(MY_TEXTCOPY_SOURCEPRE) $(PRJ)$/docs$/cpp$/ref$/cpp.css $(MY_TEXTCOPY_TARGETPRE) $(@:d:d)$/cpp.css
 +.IF "$(VERBOSE)" == "TRUE"
 +MY_QUIET = NO
 +.ELSE
 +MY_QUIET = YES
 +.END
 +
 +$(CPP_DOCU_INDEX_FILE) .ERRREMOVE : $(CPP_DOCU_CLEANUP_FLAG)
 +    -$(MKDIRHIER) $(@:d)
 +    $(SED) \
 +        -e 's!^INPUT = %$$!INPUT = main.dox $(INCLUDETOPDIRLIST) $(INCLUDEFILELIST)!' \
 +        -e 's!^OUTPUT_DIRECTORY = %$$!OUTPUT_DIRECTORY = $(DESTDIRGENCPPREF)!' \
 +        -e 's!^PROJECT_BRIEF = %$$!PROJECT_BRIEF = $(CPPDOCREFNAME)!' \
 +        -e 's!^QUIET = %$$!QUIET = $(MY_QUIET)!' \
 +        -e 's!^STRIP_FROM_PATH = %$$!STRIP_FROM_PATH = $(SOLARINCDIR)!' \
 +        Doxyfile > $(MISC)/Doxyfile
 +    $(DOXYGEN) $(MISC)/Doxyfile
  
- $(JAVA_SRC_FILES) : $(SOLARCOMMONBINDIR)$/$$(@:f)
+ $(JAVA_SRC_FILES) : $(SOLARCOMMONPCKDIR)$/$$(@:f)
      -$(MKDIRHIER) $(@:d)        
      $(MY_COPY) $< $@
      cd $(JAVA_SRC_DIR) && unzip -quo $(@:f)
diff --cc solenv/gbuild/JavaClassSet.mk
index 6fd19fe,c03b3dc..838b957
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@@ -26,9 -26,13 +26,13 @@@
  #
  #*************************************************************************
  
 -gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER)
 +gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) $(JAVAFLAGS)
  gb_JavaClassSet_JAVACDEBUG :=
  
+ # Enforces correct dependency order for possibly generated stuff:
+ # generated sources, jars/classdirs etc.
+ gb_JavaClassSet_get_preparation_target = $(WORKDIR)/JavaClassSet/$(1)/prepared
+ 
  ifneq ($(gb_DEBUGLEVEL),0)
  gb_JavaClassSet_JAVACDEBUG := -g
  endif
diff --cc solenv/gbuild/platform/windows.mk
index 5207cb5,56bddc7..59c23be
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/windows.mk
@@@ -29,14 -29,8 +29,16 @@@ GUI := WN
  
  gb_Helper_OUTDIRLIBDIR := $(OUTDIR)/bin
  
+ gb_Helper_get_rcfile = $(1).ini
+ 
  gb_MKTEMP := mktemp --tmpdir=$(gb_TMPDIR) gbuild.XXXXXX
  
 +gb_OSDEFS := \
 +	-DWINVER=0x0500 \
 +	-D_WIN32_IE=0x0500 \
 +	-DWIN32 \
 +	-DWNT \
 +	-DNOMINMAX \
 +
 +
  # vim:set noexpandtab:
commit 144390821535d03735819d229e5ec397972b2436
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Thu Feb 16 15:05:55 2012 +0100

    unoil: fix Windows build

diff --git a/unoil/climaker/Makefile b/unoil/climaker/Makefile
index a1f1fe6..0d029f7 100644
--- a/unoil/climaker/Makefile
+++ b/unoil/climaker/Makefile
@@ -31,6 +31,7 @@ include $(GBUILDDIR)/gbuild_simple.mk
 include $(SRCDIR)/unoil/climaker/version.txt
 
 cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
+	$(call gb_Helper_abbreviate_dirs_native, \
 	$(call gb_Helper_execute,climaker \
 		$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
 		--out $@ \
@@ -40,16 +41,18 @@ cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
 		-X $(OUTDIR)/bin/udkapi.rdb \
 		-r $(OUTDIR)/bin/cli_uretypes.dll \
 		--keyfile $(OUTDIR)/bin/cliuno.snk \
-		$(OUTDIR)/bin/offapi.rdb)
+		$(OUTDIR)/bin/offapi.rdb) > /dev/null)
 
 cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config $(SRCDIR)/unoil/climaker/version.txt
-	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $< $@
+	$(call gb_Helper_abbreviate_dirs_native, \
+	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
 
 $(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : cli_oootypes.dll cli_oootypes.config
+	$(call gb_Helper_abbreviate_dirs_native, \
 	al -out:$@ \
 		-version:$(CLI_OOOTYPES_POLICY_VERSION) \
 		-keyfile:$(OUTDIR)/bin/cliuno.snk \
-		-link:cli_oootypes.config
+		-link:cli_oootypes.config)
 
 .DEFAULT_GOAL := all
 .PHONY : all
commit 22431c50922eab47df0d8bd4f5c886e06fba24fb
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Thu Feb 16 15:02:01 2012 +0100

    gbuild: Jar: fix building .jars on Windows

diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk
index bf4ed12..70c14c5 100644
--- a/solenv/gbuild/Jar.mk
+++ b/solenv/gbuild/Jar.mk
@@ -65,7 +65,7 @@ define gb_Jar__command
 	mkdir -p $(dir $(2)) && cd $(call gb_Jar_get_workdir,$(1)) && \
 	$(gb_Jar_JARCOMMAND) cfm $(2) $(call gb_Jar_get_manifest_target,$(1)) \
 		META-INF $(PACKAGEROOTS) $(PACKAGEFILES) \
-	$(foreach root,$(PACKAGEDIRS),&& $(gb_Jar_JARCOMMAND) uf $(2) -C $(dir $(root)) $(notdir $(root))) \
+	$(foreach root,$(PACKAGEDIRS),&& cd $(dir $(root)) && $(gb_Jar_JARCOMMAND) uf $(2) $(notdir $(root))) \
 	|| (rm $(2); false) )
 endef
 
commit 980e69cd61b41a644de0736ee7b70c84f5b9e013
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Wed Feb 15 23:26:40 2012 +0100

    add gb_Helper_abbreviate_dirs_native

diff --git a/javaunohelper/cppumaker/Makefile b/javaunohelper/cppumaker/Makefile
index 230daa0..017acf1 100644
--- a/javaunohelper/cppumaker/Makefile
+++ b/javaunohelper/cppumaker/Makefile
@@ -29,6 +29,7 @@ gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 done :
+	$(call gb_Helper_abbreviate_dirs_native, \
 	$(call gb_Helper_execute,cppumaker -C -BUCR -O. \
 		-Tcom.sun.star.beans.NamedValue \
 		-Tcom.sun.star.beans.XPropertySet \
@@ -51,7 +52,7 @@ done :
 		-Tcom.sun.star.uno.XComponentContext \
 		-Tcom.sun.star.uno.XWeak \
 		$(OUTDIR)/bin/udkapi.rdb) && \
-	touch $@
+	touch $@)
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/Makefile b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
index 2e91b1d..b190038 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/Makefile
+++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
@@ -28,7 +28,8 @@
 include $(GBUILDDIR)/gbuild.mk
 
 JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
-	$(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^
+	$(call gb_Helper_abbreviate_dirs_native, \
+	$(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^)
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/ridljar/javamaker/Makefile b/ridljar/javamaker/Makefile
index 65c106b..d2fe741 100644
--- a/ridljar/javamaker/Makefile
+++ b/ridljar/javamaker/Makefile
@@ -29,7 +29,8 @@ gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 done : $(OUTDIR)/bin/udkapi.rdb
-	$(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@
+	$(call gb_Helper_abbreviate_dirs_native, \
+	$(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@)
 
 .DEFAULT_GOAL := all
 .PHONY : all
diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile
index 7c21708..d39e96b 100644
--- a/unoil/javamaker/Makefile
+++ b/unoil/javamaker/Makefile
@@ -29,8 +29,9 @@ gb_PARTIALBUILD := T
 include $(GBUILDDIR)/gbuild_simple.mk
 
 done :
+	$(call gb_Helper_abbreviate_dirs_native, \
 	$(call gb_Helper_execute,javamaker -BUCR -O$(realpath .) $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
-	touch $@
+	touch $@)
 
 .DEFAULT_GOAL := all
 .PHONY : all
commit 2faa029ade2b1bec92016e78b744502fbf680e38
Author: Matus Kukan <matus.kukan at gmail.com>
Date:   Wed Feb 15 23:25:11 2012 +0100

    jvmfwk: these are also linked_libs

diff --git a/jvmfwk/Library_jvmfwk.mk b/jvmfwk/Library_jvmfwk.mk
index 5638164..e58dade 100644
--- a/jvmfwk/Library_jvmfwk.mk
+++ b/jvmfwk/Library_jvmfwk.mk
@@ -47,7 +47,7 @@ $(eval $(call gb_Library_add_linked_libs,jvmfwk,\
 ))
 
 ifeq ($(OS),WNT)
-$(eval $(call gb_Library_add_libs,jvmfwk,\
+$(eval $(call gb_Library_add_linked_libs,jvmfwk,\
     advapi32 \
 ))
 endif
diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 9ce5461..734e564 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -55,7 +55,7 @@ $(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
 endif
 
 ifeq ($(GUI),WNT)
-$(eval $(call gb_Library_add_libs,sunjavaplugin,\
+$(eval $(call gb_Library_add_linked_libs,sunjavaplugin,\
     advapi32 \
     uwinapi \
 ))
commit 0b8934ceb38a5ba7d33906697412e31b76c5a12a
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 27 11:17:57 2011 +0100

    build jnilib on MacOS X

diff --git a/jurt/Module_jurt.mk b/jurt/Module_jurt.mk
index d56de79..50339cd 100644
--- a/jurt/Module_jurt.mk
+++ b/jurt/Module_jurt.mk
@@ -35,6 +35,12 @@ $(eval $(call gb_Module_add_targets,jurt,\
     Zip_jurt \
 ))
 
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,jurt,\
+    Package_jnilib \
+))
+endif
+
 ifeq ($(OS),WNT)
 $(eval $(call gb_Module_add_targets,jurt,\
     Library_jpipx \
diff --git a/jurt/Package_jnilib.mk b/jurt/Package_jnilib.mk
new file mode 100644
index 0000000..4ff0c66
--- /dev/null
+++ b/jurt/Package_jnilib.mk
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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 or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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_Package_Package,jurt_jnilib,$(WORKDIR)/CustomTarget/jurt/util))
+
+$(eval $(call gb_Package_add_file,lib/$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe)),,$(patsubst %.dylib,%.jnilib,$(call gb_Library_get_filename,jpipe))))
+
+$(eval $(call gb_Package_add_customtarget,jurt_jnilib,jurt/util))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,jurt/util,\
+    $(call gb_Library_get_target,jpipe) \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jurt/util/Makefile b/jurt/util/Makefile
new file mode 100644
index 0000000..3230b22
--- /dev/null
+++ b/jurt/util/Makefile
@@ -0,0 +1,38 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# 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 or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# 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.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# 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.
+
+gb_PARTIALBUID := T
+include $(GBUILDDIR)/gbuild.mk
+
+libjpipe.jnilib :
+	$(SOLARENV)/bin/macosx-create-bundle $(call gb_Library_get_target,jpipe)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : libjpipe.jnilib
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
commit 1e4961b82554bcac4e7103345354ed8fb7782472
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 27 10:12:52 2011 +0100

    move jvmfwk to the right layer

diff --git a/Repository.mk b/Repository.mk
index 58d9000..bde8a3c 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -271,6 +271,7 @@ $(eval $(call gb_Helper_register_libraries,PLAINLIBS_URE, \
     jpipe \
     juh \
     juhx \
+    jvmfwk \
     sal_textenc \
     sunjavaplugin \
 	xmlreader \
@@ -399,7 +400,6 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_URE, \
 
 $(eval $(call gb_Helper_register_libraries,UNOVERLIBS, \
     cppu \
-    jvmfwk \
     sal \
 ))
 
commit d4f2289394b04c8cd103350d0481598a303e2b3f
Author: David Tardon <dtardon at redhat.com>
Date:   Tue Dec 27 10:05:41 2011 +0100

    move jvmaccess to the right layer

diff --git a/Repository.mk b/Repository.mk
index b6bde2f..58d9000 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -346,12 +346,12 @@ $(eval $(call gb_Helper_register_libraries,RTLIBS, \
     comphelper \
     i18nisolang1 \
     i18nutil \
-    jvmaccess \
     ucbhelper \
 ))
 
 $(eval $(call gb_Helper_register_libraries,RTVERLIBS, \
     cppuhelper \
+    jvmaccess \
 	purpenvhelper \
     salhelper \
 ))
commit 3c29bf2260bb3d982a72c755df5ae10845a62110
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 26 10:47:24 2011 +0100

    sunjavaplugin has been renamed

diff --git a/jvmfwk/inc/jvmfwk/framework.h b/jvmfwk/inc/jvmfwk/framework.h
index 6119c53..0326309 100644
--- a/jvmfwk/inc/jvmfwk/framework.h
+++ b/jvmfwk/inc/jvmfwk/framework.h
@@ -143,7 +143,7 @@ extern "C" {
     <p>
     regcomp -env:UNO_JAVA_JFW_JREHOME=file:///d:/j2re1.4.2
     -env:&quot;UNO_JAVA_JFW_CLASSPATH=d:\\solver\\bin\\classes.jar;d:\\solver\\bin\\jurt.jar&quot;
-    -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\sunjavaplugin.dll -register ....
+    -env:UNO_JAVA_JFW_PLUGIN=file:\\solver\\bin\\libsunjavaplugin.dll -register ....
     </p>
     <p>Additionall parameters for the Java VM can be provided. For every parameter
     a seperate bootstrap parameter must be specified. The names are
diff --git a/postprocess/rebase/coffbase.txt b/postprocess/rebase/coffbase.txt
index ea7f867..7c6961a 100644
--- a/postprocess/rebase/coffbase.txt
+++ b/postprocess/rebase/coffbase.txt
@@ -271,7 +271,7 @@ store3.dll       0x000000005e2e0000 0x00020000
 streams.uno.dll  0x000000005e2b0000 0x00020000
 stringresourcemi.uno.dll 0x000000005e280000 0x00020000
 stsmi.dll        0x000000005e1f0000 0x00080000
-sunjavaplugin.dll 0x000000005e1c0000 0x00020000
+libsunjavaplugin.dll 0x000000005e1c0000 0x00020000
 svgfiltermi.dll  0x000000005e190000 0x00020000
 svgmi.dll        0x000000005e160000 0x00020000
 svlmi.dll        0x000000005e090000 0x000c0000
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index 3008835..c11a6e9 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -113,7 +113,7 @@ my $brand_program_dir = 'program';
 my $ure_lib_dir = 'ure-link/lib';
 my $win_ure_lib_dir = 'URE/bin';
 
-my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
+my @exceptions = ( 'cppuhelper', 'libsunjavaplugin', 'libjvmfwk' );
 
 my $bin;
 $bin = "|\\.bin" if ($TARGET eq 'wntgcci.pro');
diff --git a/ure/source/README b/ure/source/README
index 1463e04..efb88d9 100644
--- a/ure/source/README
+++ b/ure/source/README
@@ -68,7 +68,7 @@ Linux x86, Solaris x86, and Solaris SPARC:
 /opt/openoffice.org/ure/lib/libjvmaccessgcc3.so.3  [private; Linux x86 only]
 /opt/openoffice.org/ure/lib/libjvmaccessC52.so.3  [private; Solaris only]
 /opt/openoffice.org/ure/lib/libjvmfwk.so.3  [private]
-/opt/openoffice.org/ure/lib/sunjavaplugin.so  [private]
+/opt/openoffice.org/ure/lib/libsunjavaplugin.so  [private]
 /opt/openoffice.org/ure/lib/JREProperties.class  [private]
 /opt/openoffice.org/ure/lib/jvmfwk3rc  [private]
 /opt/openoffice.org/ure/lib/libgcc3_uno.so  [private; Linux x86 only]
@@ -129,7 +129,7 @@ Program Files\URE\bin\store3.dll  [private]
 Program Files\URE\bin\xmlreader.dll  [private]
 Program Files\URE\bin\jvmaccess3MSC.dll  [private]
 Program Files\URE\bin\jvmfwk3.dll  [private]
-Program Files\URE\bin\sunjavaplugin.dll  [private]
+Program Files\URE\bin\libsunjavaplugin.dll  [private]
 Program Files\URE\bin\JREProperties.class  [private]
 Program Files\URE\bin\jvmfwk3.ini  [private]
 Program Files\URE\bin\msci_uno.dll  [private]
commit eff62d413895d02b92da1a8396cb2bea1ce93902
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Dec 26 10:46:37 2011 +0100

    export libsunjavaplugin's API functions

diff --git a/jvmfwk/Library_sunjavaplugin.mk b/jvmfwk/Library_sunjavaplugin.mk
index 6e1a2f6..9ce5461 100644
--- a/jvmfwk/Library_sunjavaplugin.mk
+++ b/jvmfwk/Library_sunjavaplugin.mk
@@ -27,6 +27,10 @@
 
 $(eval $(call gb_Library_Library,sunjavaplugin))
 
+$(eval $(call gb_Library_add_defs,sunjavaplugin,\
+    -DJVMFWK_PLUGIN_DLLIMPLEMENTATION \
+))
+
 ifneq ($(JVM_ONE_PATH_CHECK),)
 $(eval $(call gb_Library_add_defs,sunjavaplugin,\
     -DJVM_ONE_PATH_CHECK=\"$(JVM_ONE_PATH_CHECK)\" \
diff --git a/jvmfwk/Package_inc.mk b/jvmfwk/Package_inc.mk
index f8ae7ea..fd8a616 100644
--- a/jvmfwk/Package_inc.mk
+++ b/jvmfwk/Package_inc.mk
@@ -29,6 +29,7 @@ $(eval $(call gb_Package_Package,jvmfwk_inc,$(SRCDIR)/jvmfwk/inc/jvmfwk))
 
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/framework.h,framework.h))
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkdllapi.h,jvmfwkdllapi.h))
+$(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/jvmfwkplugindllapi.h,jvmfwkplugindllapi.h))
 $(eval $(call gb_Package_add_file,jvmfwk_inc,inc/jvmfwk/vendorplugin.h,vendorplugin.h))
 
 # vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
new file mode 100644
index 0000000..c7a2990
--- /dev/null
+++ b/jvmfwk/inc/jvmfwk/jvmfwkplugindllapi.h
@@ -0,0 +1,44 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * Version: MPL 1.1 / GPLv3+ / LGPLv3+
+ *
+ * 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 or as specified alternatively below. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ *
+ * 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.
+ *
+ * Major Contributor(s):
+ * Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
+ *  (initial developer)
+ *
+ * All Rights Reserved.
+ *
+ * For minor contributions see the git repository.
+ *
+ * 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.
+ */
+
+#ifndef INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+#define INCLUDED_JVMFWK_JVMFWKPLUGINDLLAPI_H
+
+#include <sal/types.h>
+
+#if defined JVMFWK_PLUGIN_DLLIMPLEMENTATION
+#   define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
+#else
+#   define JVMFWK_PLUGIN_DLLPUBLIC SAL_DLLPUBLIC_IMPORT
+#endif
+#define JVMFWK_PLUGIN_DLLPRIVATE SAL_DLLPRIVATE
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/jvmfwk/inc/jvmfwk/vendorplugin.h b/jvmfwk/inc/jvmfwk/vendorplugin.h
index 3ccbb0e..302037c 100644
--- a/jvmfwk/inc/jvmfwk/vendorplugin.h
+++ b/jvmfwk/inc/jvmfwk/vendorplugin.h
@@ -30,6 +30,7 @@
 #if !defined INCLUDED_JVMFWK_VENDORPLUGIN_H
 #define INCLUDED_JVMFWK_VENDORPLUGIN_H
 
+#include "jvmfwkplugindllapi.h"
 #include "jvmfwk/framework.h"
 #include "rtl/ustring.h"
 #ifdef SOLAR_JAVA
@@ -126,7 +127,7 @@ typedef enum
     <code>sMinVersion,sMaxVersion,arExcludeList</code> are not recognized as valid
     version strings.
  */
-javaPluginError jfw_plugin_getAllJavaInfos(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getAllJavaInfos(
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
     rtl_uString *sMaxVersion,
@@ -177,7 +178,7 @@ javaPluginError jfw_plugin_getAllJavaInfos(
    does not mean necessarily that there is no JRE. There could be a JRE but it has
    a vendor which is not supported by this API implementation.
  */
-javaPluginError jfw_plugin_getJavaInfoByPath(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_getJavaInfoByPath(
     rtl_uString *sLocation,
     rtl_uString *sVendor,
     rtl_uString *sMinVersion,
@@ -230,7 +231,7 @@ javaPluginError jfw_plugin_getJavaInfoByPath(
     JFW_PLUGIN_E_VM_CREATION_FAILED a VM could not be created. The error was caused
     by the JRE.
  */
-javaPluginError jfw_plugin_startJavaVirtualMachine(
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_startJavaVirtualMachine(
     const JavaInfo *pInfo,
     const JavaVMOption *arOptions,
     sal_Int32 nSizeOptions,
@@ -256,7 +257,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
     JFW_PLUGIN_E_ERROR an error occurred during execution.</br>
     JFW_PLUGIN_E_INVALID_ARG pInfo contains invalid data</br>
  */
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+JVMFWK_PLUGIN_DLLPUBLIC javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
 
 #ifdef __cplusplus
 }
commit 350531b1a8d7010a9be31fa21d9c5db0039f7153
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 25 15:28:08 2011 +0100

    do not compile if there are no sources

diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 43e3dac..c03b3dc 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -40,17 +40,18 @@ endif
 define gb_JavaClassSet__command
 $(call gb_Helper_abbreviate_dirs_native,\
 	mkdir -p $(dir $(1)) && \
-	RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
-		$(call gb_Helper_convert_native,\
-		$(if $(filter-out $(JARDEPS),$(3)),\
-	    	$(filter-out $(JARDEPS),$(3)),\
-			$(filter-out $(JARDEPS),$(4))))) && \
-	$(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
-		$(gb_JavaClassSet_JAVACDEBUG) \
-		-cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
-		-d $(call gb_JavaClassSet_get_classdir,$(2)) \
-		@$$RESPONSEFILE &&) \
-	rm -f $$RESPONSEFILE && \
+	$(if $(filter-out $(JARDEPS),$(4)), \
+	    RESPONSEFILE=$(call var2file,$(shell $(gb_MKTEMP)),500,\
+		    $(call gb_Helper_convert_native,\
+		    $(if $(filter-out $(JARDEPS),$(3)),\
+		    $(filter-out $(JARDEPS),$(3)),\
+			    $(filter-out $(JARDEPS),$(4))))) && \
+	    $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \
+		    $(gb_JavaClassSet_JAVACDEBUG) \
+		    -cp "$(T_CP)$(gb_CLASSPATHSEP)$(call gb_JavaClassSet_get_classdir,$(2))" \
+		    -d $(call gb_JavaClassSet_get_classdir,$(2)) \
+		    @$$RESPONSEFILE &&) \
+	    rm -f $$RESPONSEFILE &&) \
 	touch $(1))
 
 endef
commit 7d2fc4b1a6c31705120ef1f70ccc0bf9db39c667
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 25 14:03:40 2011 +0100

    remove stray makefiles

diff --git a/javaunohelper/com/sun/star/comp/helper/makefile.mk b/javaunohelper/com/sun/star/comp/helper/makefile.mk
deleted file mode 100644
index 3752abc..0000000
--- a/javaunohelper/com/sun/star/comp/helper/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/comp$/helper
-TARGET  = com_sun_star_comp_helper
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/settings.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES=	\
-    ComponentContextEntry.java		\
-    ComponentContext.java			\
-    Bootstrap.java				\
-    SharedLibraryLoader.java		\
-    RegistryServiceFactory.java		\
-    BootstrapException.java			\
-    UnoInfo.java
-
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/javaunohelper/com/sun/star/comp/juhtest/makefile.mk b/javaunohelper/com/sun/star/comp/juhtest/makefile.mk
deleted file mode 100644
index 0d65b96..0000000
--- a/javaunohelper/com/sun/star/comp/juhtest/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/comp$/juhtest
-TARGET  = com_sun_star_comp_juhtest
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/settings.pmk
-
-# --- Files --------------------------------------------------------
-#todo: we do not want include juh.jar here but use the output tree.
-JARFILES = unoil.jar ridl.jar jurt.jar
-
-JAVAFILES=	\
-    SmoketestCommandEnvironment.java
-
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/javaunohelper/com/sun/star/comp/makefile.mk b/javaunohelper/com/sun/star/comp/makefile.mk
deleted file mode 100644
index bde016b..0000000
--- a/javaunohelper/com/sun/star/comp/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..
-
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/comp
-TARGET  = com_sun_star_comp
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/settings.pmk
-
-# --- Files --------------------------------------------------------
-JARFILES = ridl.jar jurt.jar unoil.jar
-JAVAFILES=	\
-    JavaUNOHelperServices.java		
-
-
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk b/javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk
deleted file mode 100644
index 793f5fb..0000000
--- a/javaunohelper/com/sun/star/lib/uno/adapter/makefile.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/lib$/uno$/adapter
-TARGET  = com_sun_star_lib_uno_adapter
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-.INCLUDE: $(PRJ)$/util$/settings.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES=	\
-    XInputStreamToInputStreamAdapter.java	\
-    XOutputStreamToOutputStreamAdapter.java	\
-    InputStreamToXInputStreamAdapter.java	\
-    OutputStreamToXOutputStreamAdapter.java	\
-    ByteArrayToXInputStreamAdapter.java \
-    XOutputStreamToByteArrayAdapter.java
-
-
-JAVACLASSFILES=	$(foreach,i,$(JAVAFILES) $(CLASSDIR)$/$(PACKAGE)$/$(i:b).class)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/makefile.mk b/javaunohelper/com/sun/star/lib/uno/helper/makefile.mk
deleted file mode 100644
index 3cab6f0..0000000
--- a/javaunohelper/com/sun/star/lib/uno/helper/makefile.mk
+++ /dev/null
@@ -1,49 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/lib$/uno$/helper
-TARGET  = com_sun_star_lib_uno_helper
-
-.INCLUDE : settings.mk
-.INCLUDE: $(PRJ)$/util$/settings.pmk
-
-JAVAFILES = \
-    ComponentBase.java \
-    Factory.java \
-    InterfaceContainer.java \
-    MultiTypeInterfaceContainer.java \
-    PropertySet.java \
-    PropertySetMixin.java \
-    UnoUrl.java \
-    WeakAdapter.java \
-    WeakBase.java
-
-.INCLUDE :  target.mk
-
diff --git a/javaunohelper/source/makefile.mk b/javaunohelper/source/makefile.mk
deleted file mode 100644
index 606ddad..0000000
--- a/javaunohelper/source/makefile.mk
+++ /dev/null
@@ -1,134 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..
-
-PRJNAME=javaunohelper
-TARGET=juh
-USE_DEFFILE=TRUE
-ENABLE_EXCEPTIONS=TRUE
-LIBTARGET=NO
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-.IF "$(SOLAR_JAVA)"==""
-nojava:
-    @echo "Not building javaunohelper because Java is disabled"
-.ENDIF
-
-# ------------------------------------------------------------------
-
-UNOUCRDEP=$(SOLARBINDIR)$/udkapi.rdb
-UNOUCRRDB=$(SOLARBINDIR)$/udkapi.rdb
-
-UNOUCROUT=$(OUT)$/inc$/comprehensive
-INCPRE+=$(OUT)$/inc$/comprehensive
-NO_OFFUH=TRUE
-CPPUMAKERFLAGS+=-C
-
-UNOTYPES= \
-        com.sun.star.beans.NamedValue \
-        com.sun.star.container.XHierarchicalNameAccess		\
-        com.sun.star.loader.XImplementationLoader		\
-        com.sun.star.registry.XRegistryKey			\
-        com.sun.star.registry.XSimpleRegistry			\
-        com.sun.star.beans.XPropertySet				\
-         com.sun.star.lang.DisposedException			\
-        com.sun.star.lang.IllegalArgumentException		\
-        com.sun.star.lang.XTypeProvider				\
-        com.sun.star.lang.XServiceInfo				\
-        com.sun.star.lang.XMultiServiceFactory			\
-        com.sun.star.lang.XMultiComponentFactory		\
-        com.sun.star.lang.XSingleServiceFactory			\
-        com.sun.star.lang.XSingleComponentFactory   		\
-        com.sun.star.uno.TypeClass				\
-        com.sun.star.uno.XWeak					\
-        com.sun.star.uno.XAggregation				\
-            com.sun.star.uno.XComponentContext          		\
-        com.sun.star.lang.XInitialization           		\
-        com.sun.star.lang.XComponent
-
-SLOFILES= \
-        $(SLO)$/javaunohelper.obj				\
-        $(SLO)$/bootstrap.obj					\
-        $(SLO)$/preload.obj \
-        $(SLO)$/vm.obj
-
-# ------------------------------------------------------------------
-
-LIB1TARGET=$(SLB)$/$(SHL1TARGET).lib
-LIB1OBJFILES=\
-        $(SLO)$/javaunohelper.obj				\
-        $(SLO)$/bootstrap.obj \
-        $(SLO)$/vm.obj
-
-SHL1TARGET=juhx
-
-SHL1STDLIBS= \
-        $(JVMACCESSLIB)		\
-        $(SALHELPERLIB)		\
-        $(SALLIB)		\
-        $(CPPULIB)		\
-        $(CPPUHELPERLIB)
-
-SHL1VERSIONMAP = javaunohelper.map
-
-SHL1DEPN=
-SHL1IMPLIB=i$(SHL1TARGET)
-SHL1LIBS=$(LIB1TARGET)
-SHL1DEF=$(MISC)$/$(SHL1TARGET).def
-SHL1RPATH=URELIB
-
-DEF1NAME=$(SHL1TARGET)
-
-# ------------------------------------------------------------------
-
-LIB2TARGET=$(SLB)$/$(SHL2TARGET).lib
-LIB2OBJFILES=\
-        $(SLO)$/preload.obj
-
-SHL2TARGET=juh
-
-SHL2STDLIBS= \
-        $(SALLIB)
-
-SHL2VERSIONMAP = javaunohelper.map
-
-SHL2DEPN=
-SHL2IMPLIB=i$(SHL2TARGET)
-SHL2LIBS=$(LIB2TARGET)
-SHL2DEF=$(MISC)$/$(SHL2TARGET).def
-SHL2RPATH=URELIB
-
-DEF2NAME=$(SHL2TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :	target.mk
-
diff --git a/javaunohelper/test/com/sun/star/comp/helper/makefile.mk b/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
deleted file mode 100644
index 5f00fac..0000000
--- a/javaunohelper/test/com/sun/star/comp/helper/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		=..$/..$/..$/..$/..$/..
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/comp$/helper
-TARGET  = com_sun_star_comp_helper_test
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = jurt.jar ridl.jar
-
-JAVACLASSFILES=	\
-    $(CLASSDIR)$/$(PACKAGE)$/ComponentContext_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/SharedLibraryLoader_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/RegistryServiceFactory_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/Bootstrap_Test.class
-
-JAVAFILES= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES)))
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk b/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
deleted file mode 100644
index d3de3df..0000000
--- a/javaunohelper/test/com/sun/star/lib/uno/helper/makefile.mk
+++ /dev/null
@@ -1,68 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ=..$/..$/..$/..$/..$/..$/..
-PRJNAME = juhelper
-PACKAGE = com$/sun$/star$/lib$/uno$/helper
-TARGET  = com_sun_star_lib_uno_helper_test
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-# --- Files --------------------------------------------------------
-
-JARFILES = jurt.jar ridl.jar juh.jar
-
-JAVACLASSFILES=	\
-    $(CLASSDIR)$/$(PACKAGE)$/WeakBase_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/ComponentBase_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/InterfaceContainer_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/MultiTypeInterfaceContainer_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/ProxyProvider.class \
-    $(CLASSDIR)$/$(PACKAGE)$/AWeakBase.class    \
-        $(CLASSDIR)$/$(PACKAGE)$/PropertySet_Test.class \
-    $(CLASSDIR)$/$(PACKAGE)$/UnoUrlTest.class	\
-    $(CLASSDIR)$/$(PACKAGE)$/Factory_Test.class
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-CPATH_JARS = java_uno.jar $(JARFILES)
-CPATH_TMP1 = $(foreach,j,$(CPATH_JARS) $(SOLARBINDIR)$/$j)
-CPATH_TMP2 = $(strip $(subst,!,$(PATH_SEPERATOR) $(CPATH_TMP1:s/ /!/)))
-CPATH = $(CPATH_TMP2)$(PATH_SEPERATOR)$(OUT)$/bin$/factory_test.jar$(PATH_SEPERATOR)$(XCLASSPATH)
-
-$(OUT)$/bin$/factory_test.jar : $(CLASSDIR)$/$(PACKAGE)$/Factory_Test.class
-    -rm -f $@
-    @echo RegistrationClassName: com.sun.star.lib.uno.helper.Factory_Test > $(OUT)$/bin$/manifest.mf
-    -jar cvfm $@ $(OUT)$/bin$/manifest.mf -C $(CLASSDIR) $(PACKAGE)$/Factory_Test.class
-
-run_factory_test : $(OUT)$/bin$/factory_test.jar
-    -$(GNUCOPY) $(SOLARBINDIR)$/udkapi.rdb $(OUT)$/bin$/factory_test.rdb
-    -java -classpath $(CPATH) com.sun.star.lib.uno.helper.Factory_Test $(OUT)$/bin$/factory_test.jar $(OUT)$/bin$/factory_test.rdb
diff --git a/javaunohelper/util/makefile.mk b/javaunohelper/util/makefile.mk
deleted file mode 100644
index 796280e..0000000
--- a/javaunohelper/util/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..
-PRJNAME = juhelper
-TARGET  = juh
-
-.INCLUDE : settings.mk
-.INCLUDE: settings.pmk
-
-JARCLASSDIRS = com
-JARTARGET		= $(TARGET).jar
-JARCOMPRESS		= TRUE
-JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
-CUSTOMMANIFESTFILE = manifest
-
-# Special work necessary for building java reference with javadoc.
-# The source of puplic APIs must be delivered and used later in the
-# odk module.
-ZIP1TARGET=$(TARGET)_src
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(PRJ)
-ZIP1LIST=com -x "*makefile.mk"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-ALLTAR : $(MISC)/juh.component
-
-$(MISC)/juh.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
-        juh.component
-    $(XSLTPROC) --nonet --stringparam uri '$(COMPONENTPREFIX_URE_JAVA)juh.jar' \
-        -o $@ $(SOLARENV)/bin/createcomponent.xslt juh.component
diff --git a/javaunohelper/util/settings.pmk b/javaunohelper/util/settings.pmk
deleted file mode 100644
index 28b2621..0000000
--- a/javaunohelper/util/settings.pmk
+++ /dev/null
@@ -1,28 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-JARFILES = ridl.jar jurt.jar
commit e8d8719ccdfd8f0f1f8f9ffe0509ec18c5aa7d09
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 25 14:02:14 2011 +0100

    remove stray delzip files

diff --git a/javaunohelper/util/delzip b/javaunohelper/util/delzip
deleted file mode 100644
index e69de29..0000000
diff --git a/jurt/util/delzip b/jurt/util/delzip
deleted file mode 100644
index e69de29..0000000
commit 5ac75ce86a1cee5a422d3415caf91566350a1162
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 25 13:46:42 2011 +0100

    bah, i committed that by mistake

diff --git a/jvmfwk/template.mk b/jvmfwk/template.mk
deleted file mode 100644
index 31f5e98..0000000
--- a/jvmfwk/template.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# 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 or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# 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.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon at redhat.com>
-#  (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# 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.
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
commit 2dc08095b5a9f768afaf9828a89cc5d7b2b17829
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 25 13:42:46 2011 +0100

    fix deps on executables

diff --git a/javaunohelper/Package_cppumaker.mk b/javaunohelper/Package_cppumaker.mk
index 5ab6664..b53301a 100644
--- a/javaunohelper/Package_cppumaker.mk
+++ b/javaunohelper/Package_cppumaker.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,javaunohelper_cppumaker,$(WORKDIR)/CustomTarget
 $(eval $(call gb_Package_add_customtarget,javaunohelper_cppumaker,javaunohelper/cppumaker))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,javaunohelper/cppumaker,\
-	$(OUTDIR_FOR_BUILD)/bin/cppumaker \
+	$(OUTDIR_FOR_BUILD)/bin/cppumaker$(gb_Executable_EXT_for_build) \
 	$(OUTDIR)/bin/udkapi.rdb \
 ))
 
diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk
index 677f11d..2d73aea 100644
--- a/ridljar/Package_javamaker.mk
+++ b/ridljar/Package_javamaker.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridlj
 $(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\
-    $(OUTDIR_FOR_BUILD)/bin/javamaker \
+    $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
     $(OUTDIR)/bin/udkapi.rdb \
 ))
 
diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk
index e12ef54..0be46d0 100644
--- a/unoil/Package_climaker.mk
+++ b/unoil/Package_climaker.mk
@@ -39,7 +39,7 @@ $(eval $(call gb_CustomTarget_add_dependencies,unoil/climaker,\
 ))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/climaker,\
-    $(OUTDIR_FOR_BUILD)/bin/climaker \
+    $(OUTDIR_FOR_BUILD)/bin/climaker$(gb_Executable_EXT_for_build) \
     $(OUTDIR)/bin/cli_uretypes.dll \
     $(OUTDIR)/bin/cliuno.snk \
     $(OUTDIR)/bin/offapi.rdb \
diff --git a/unoil/Package_javamaker.mk b/unoil/Package_javamaker.mk
index add0a60..7b7fcb7 100644
--- a/unoil/Package_javamaker.mk
+++ b/unoil/Package_javamaker.mk
@@ -30,7 +30,7 @@ $(eval $(call gb_Package_Package,unoil_javamaker,$(WORKDIR)/CustomTarget/unoil/j
 $(eval $(call gb_Package_add_customtarget,unoil_javamaker,unoil/javamaker))
 
 $(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/javamaker,\
-    $(OUTDIR_FOR_BUILD)/bin/javamaker \
+    $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
     $(OUTDIR)/bin/offapi.rdb \
     $(OUTDIR)/bin/udkapi.rdb \
 ))
commit 39fe159f3c78faa9cdc9d39c279183cfb4c7a0ec
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 25 13:34:50 2011 +0100

    remove stray makefiles

diff --git a/jurt/com/sun/star/comp/bridgefactory/makefile.mk b/jurt/com/sun/star/comp/bridgefactory/makefile.mk
deleted file mode 100644
index fa1c734..0000000
--- a/jurt/com/sun/star/comp/bridgefactory/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/comp$/bridgefactory
-TARGET  = com_sun_star_comp_bridgefactory
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = BridgeFactory.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/com/sun/star/comp/connections/makefile.mk b/jurt/com/sun/star/comp/connections/makefile.mk
deleted file mode 100644
index 9914110..0000000
--- a/jurt/com/sun/star/comp/connections/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = jurt
-TARGET = com_sun_star_comp_connections
-
-PACKAGE = com$/sun$/star$/comp$/connections
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    Acceptor.java \
-    Connector.java \
-    ConstantInstanceProvider.java \
-    Implementation.java \
-    PipedConnection.java
-
-.INCLUDE:  target.mk
diff --git a/jurt/com/sun/star/comp/loader/makefile.mk b/jurt/com/sun/star/comp/loader/makefile.mk
deleted file mode 100644
index 8495099..0000000
--- a/jurt/com/sun/star/comp/loader/makefile.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/comp$/loader
-TARGET  = com_sun_star_comp_loader
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = \
-    FactoryHelper.java \
-    JavaLoader.java \
-    JavaLoaderFactory.java \
-    RegistrationClassFinder.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/com/sun/star/comp/servicemanager/makefile.mk b/jurt/com/sun/star/comp/servicemanager/makefile.mk
deleted file mode 100644
index 46fae35..0000000
--- a/jurt/com/sun/star/comp/servicemanager/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/comp$/servicemanager
-TARGET  = com_sun_star_comp_servicemanager
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = ServiceManager.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/com/sun/star/comp/urlresolver/makefile.mk b/jurt/com/sun/star/comp/urlresolver/makefile.mk
deleted file mode 100644
index 20f4dd7..0000000
--- a/jurt/com/sun/star/comp/urlresolver/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/comp$/urlresolver
-TARGET  = com_sun_star_comp_urlresolver
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# Files --------------------------------------------------------
-
-JAVAFILES = UrlResolver.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/com/sun/star/lib/connections/pipe/makefile.mk b/jurt/com/sun/star/lib/connections/pipe/makefile.mk
deleted file mode 100644
index d90bc63..0000000
--- a/jurt/com/sun/star/lib/connections/pipe/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME = jurt
-TARGET = com_sun_star_connections_pipe
-
-PACKAGE = com$/sun$/star$/lib$/connections$/pipe
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    PipeConnection.java \
-    pipeAcceptor.java \
-    pipeConnector.java
-
-.INCLUDE:  target.mk
diff --git a/jurt/com/sun/star/lib/connections/socket/makefile.mk b/jurt/com/sun/star/lib/connections/socket/makefile.mk
deleted file mode 100644
index a1e437a..0000000
--- a/jurt/com/sun/star/lib/connections/socket/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..$/..
-PRJNAME = jurt
-TARGET = com_sun_star_connections_socket
-
-PACKAGE = com$/sun$/star$/lib$/connections$/socket
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    ConnectionDescriptor.java \
-    SocketConnection.java \
-    socketAcceptor.java \
-    socketConnector.java
-
-.INCLUDE:  target.mk
diff --git a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk b/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
deleted file mode 100644
index 513565c..0000000
--- a/jurt/com/sun/star/lib/uno/bridges/java_remote/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-
-TARGET := com_sun_star_lib_uno_bridges_java_remote
-PACKAGE = com$/sun$/star$/lib$/uno$/bridges$/java_remote
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    BridgedObject.java \
-    ProxyFactory.java \
-    RequestHandler.java \
-    XConnectionInputStream_Adapter.java \
-    XConnectionOutputStream_Adapter.java \
-    java_remote_bridge.java
-
-.INCLUDE: target.mk
diff --git a/jurt/com/sun/star/lib/uno/environments/java/makefile.mk b/jurt/com/sun/star/lib/uno/environments/java/makefile.mk
deleted file mode 100644
index de9bb61..0000000
--- a/jurt/com/sun/star/lib/uno/environments/java/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/lib$/uno$/environments$/java
-TARGET  = com_sun_star_lib_uno_environments_java
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = java_environment.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
diff --git a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk b/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk
deleted file mode 100644
index cc4a7fe..0000000
--- a/jurt/com/sun/star/lib/uno/environments/remote/makefile.mk
+++ /dev/null
@@ -1,50 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-
-TARGET := com_sun_star_lib_uno_environments_remote
-PACKAGE := com$/sun$/star$/lib$/uno$/environments$/remote
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    IProtocol.java \
-    IReceiver.java \
-    IThreadPool.java \
-    JavaThreadPool.java \
-    JavaThreadPoolFactory.java \
-    Job.java \
-    JobQueue.java \
-    Message.java \
-    NativeThreadPool.java \
-    ThreadId.java \
-    ThreadPoolManager.java \
-    remote_environment.java
-
-.INCLUDE: target.mk
diff --git a/jurt/com/sun/star/lib/uno/makefile.mk b/jurt/com/sun/star/lib/uno/makefile.mk
deleted file mode 100644
index 6270e78..0000000
--- a/jurt/com/sun/star/lib/uno/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..$/..
-PRJNAME = jurt
-TARGET = com_sun_star_lib_uno
-PACKAGE = com$/sun$/star$/lib$/uno
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = Proxy.java
-
-.INCLUDE: target.mk
diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk b/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk
deleted file mode 100644
index c1b7357..0000000
--- a/jurt/com/sun/star/lib/uno/protocols/urp/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..$/..$/..
-PRJNAME := jurt
-
-TARGET := com_sun_star_lib_uno_protocols_urp
-PACKAGE := com$/sun$/star$/lib$/uno$/protocols$/urp
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    Cache.java \
-    Marshal.java \
-    PendingRequests.java \
-    Unmarshal.java \
-    UrpMessage.java \
-    urp.java
-
-.INCLUDE: target.mk
diff --git a/jurt/com/sun/star/lib/util/makefile.mk b/jurt/com/sun/star/lib/util/makefile.mk
deleted file mode 100644
index 323e0dd..0000000
--- a/jurt/com/sun/star/lib/util/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ := ..$/..$/..$/..$/..
-PRJNAME := jurt
-
-TARGET := com_sun_star_lib_util
-PACKAGE := com$/sun$/star$/lib$/util
-
-.INCLUDE: $(PRJ)$/util$/makefile.pmk
-
-JAVAFILES = \
-    AsynchronousFinalizer.java \
-    NativeLibraryLoader.java \
-    StringHelper.java \
-    UrlToFileMapper.java
-
-.INCLUDE: target.mk
diff --git a/jurt/com/sun/star/uno/makefile.mk b/jurt/com/sun/star/uno/makefile.mk
deleted file mode 100644
index 7ab0026..0000000
--- a/jurt/com/sun/star/uno/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..$/..$/..$/..
-PRJNAME = jurt
-PACKAGE = com$/sun$/star$/uno
-TARGET  = com_sun_star_uno
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Files --------------------------------------------------------
-
-JAVAFILES = \
-    AnyConverter.java \
-    Ascii.java \
-    AsciiString.java \
-    MappingException.java \
-    WeakReference.java
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
-
-doc:
-    pwd
-    cd $(PRJ) && javadoc -sourcepath /usr/local/java/src:unxlngi3.pro/japi:.:../jlibs  com.sun.star.lib.util com.sun.star.uno com.sun.star.lib.uno.typeinfo com.sun.star.lib.uno.environments.java com.sun.star.lib.uno.environments.remote com.sun.star.lib.uno.protocols.iiop com.sun.star.lib.uno.bridges.java_remote com.sun.star.comp.loader com.sun.star.comp.connections -d unxlngi3.pro/doc 
diff --git a/jurt/source/pipe/makefile.mk b/jurt/source/pipe/makefile.mk
deleted file mode 100644
index 4a6dc59..0000000
--- a/jurt/source/pipe/makefile.mk
+++ /dev/null
@@ -1,58 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-PRJ = ../..
-PRJNAME = jurt
-TARGET = jpipe
-
-NO_DEFAULT_STL = TRUE
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-.IF "$(OS)" == "WNT"
-SHL1TARGET = jpipx
-.ELSE
-SHL1TARGET = jpipe
-.END
-
-SHL1CODETYPE = C
-SHL1CREATEJNILIB=TRUE
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/com_sun_star_lib_connections_pipe_PipeConnection.obj
-SHL1RPATH = URELIB
-SHL1STDLIBS = $(SALLIB)
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.IF "$(SOLAR_JAVA)" == ""
-nothing .PHONY :
-.END
-
-.INCLUDE: target.mk
diff --git a/jurt/source/pipe/wrapper/makefile.mk b/jurt/source/pipe/wrapper/makefile.mk
deleted file mode 100644
index 88a3b16..0000000
--- a/jurt/source/pipe/wrapper/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#***********************************************************************/
-
-PRJ = ../../..
-PRJNAME = jurt
-TARGET = wrapper
-
-NO_DEFAULT_STL = TRUE
-UWINAPILIB =
-VISIBILITY_HIDDEN = TRUE
-
-.INCLUDE: settings.mk
-
-SHL1CODETYPE = C
-SHL1IMPLIB = i$(SHL1TARGET)
-SHL1OBJS = $(SLO)/wrapper.obj
-SHL1RPATH = URELIB
-SHL1TARGET = jpipe
-SHL1USE_EXPORTS = name
-DEF1NAME = $(SHL1TARGET)
-
-SLOFILES = $(SHL1OBJS)
-
-.IF "$(SOLAR_JAVA)" == ""
-nothing .PHONY :
-.END
-
-.INCLUDE: target.mk
diff --git a/jurt/util/makefile.mk b/jurt/util/makefile.mk
deleted file mode 100644
index fdc672a..0000000
--- a/jurt/util/makefile.mk
+++ /dev/null
@@ -1,52 +0,0 @@
-#*************************************************************************
-#
-# 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.
-#
-#*************************************************************************
-
-PRJ		= ..
-PRJNAME	= jurt
-TARGET	= jurt
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE: makefile.pmk
-
-JARCLASSDIRS	= com
-JARTARGET		= $(TARGET).jar
-JARCOMPRESS 	= TRUE
-JARCLASSPATH = $(JARFILES) ../../lib/ ../bin/
-CUSTOMMANIFESTFILE = manifest
-
-# Special work necessary for building java reference with javadoc.
-# The source of puplic APIs must be delivered and used later in the
-# odk module.
-ZIP1TARGET=$(TARGET)_src
-ZIP1FLAGS=-u -r
-ZIP1DIR=$(PRJ)
-ZIP1LIST=com -x "*makefile.mk"
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/jurt/util/makefile.pmk b/jurt/util/makefile.pmk

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list