merge feature/gbuild_java

20 files changed, 320 insertions, 405 deletions

diff --git a/unoil/Jar_unoil.mk b/unoil/Jar_unoil.mk
new file mode 100644
index 000000000000..edc0471ee6b3
--- /dev/null
+++ b/unoil/Jar_unoil.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@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_Jar_Jar,unoil))
+
+$(eval $(call gb_Jar_add_package_dependencies,unoil,\
+    unoil_javamaker \
+))
+
+$(eval $(call gb_Jar_add_packagedirs,unoil,\
+    $(WORKDIR)/CustomTarget/unoil/javamaker/com \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/javamaker/makefile.mk b/unoil/Makefile
index 47f910339151..7bbbe6c703e6 100644
--- a/unoil/javamaker/makefile.mk
+++ b/unoil/Makefile
@@ -1,3 +1,4 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
 #*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -25,23 +26,15 @@
 #
 #*************************************************************************
 
-PRJ := ..
-PRJNAME := unoil
-TARGET := javamaker
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
 
-.INCLUDE: settings.mk
+gb_SourceEnvAndRecurse_STAGE=gbuild
+include $(SOLARENV)/gbuild/gbuild.mk
 
-RDB = $(SOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
 
-.INCLUDE: target.mk
-
-.IF "$(SOLAR_JAVA)" != ""
-
-ALLTAR: $(MISC)$/javamaker.done
-
-$(MISC)$/javamaker.done .ERRREMOVE: $(RDB) $(EXTRA_RDB)
-    $(JAVAMAKER) -BUCR -O$(CLASSDIR) $(RDB) -X$(EXTRA_RDB)
-    $(TOUCH) $@
-
-.ENDIF
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
new file mode 100644
index 000000000000..826e5a712c38
--- /dev/null
+++ b/unoil/Module_unoil.mk
@@ -0,0 +1,47 @@
+# -*- 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@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_Module_Module,unoil))
+
+$(eval $(call gb_Module_add_targets,unoil,\
+    Package_clioootypesversion \
+))
+
+ifneq ($(SOLAR_JAVA),)
+$(eval $(call gb_Module_add_targets,unoil,\
+    Jar_unoil \
+    Package_javamaker \
+))
+endif
+
+ifeq ($(COM),MSC)
+$(eval $(call gb_Module_add_targets,unoil,\
+    Package_climaker \
+))
+endif
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk
new file mode 100644
index 000000000000..0be46d0476cc
--- /dev/null
+++ b/unoil/Package_climaker.mk
@@ -0,0 +1,49 @@
+# -*- 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@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,unoil_climaker,$(WORKDIR)/CustomTarget/unoil/climaker))
+
+$(eval $(call gb_Package_add_customtarget,unoil_climaker,unoil/climaker))
+
+$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.config,cli_oootypes.config))
+$(eval $(call gb_Package_add_file,unoil_climaker,bin/cli_oootypes.dll,cli_oootypes.dll))
+$(eval $(call gb_Package_add_file,unoil_climaker,bin/policy.1.0.cli_oootypes.dll,policy.1.0.cli_oootypes.dll))
+
+$(eval $(call gb_CustomTarget_add_dependencies,unoil/climaker,\
+    unoil/climaker/cli_oootypes_config \
+    unoil/climaker/version.txt \
+))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/climaker,\
+    $(OUTDIR_FOR_BUILD)/bin/climaker$(gb_Executable_EXT_for_build) \
+    $(OUTDIR)/bin/cli_uretypes.dll \
+    $(OUTDIR)/bin/cliuno.snk \
+    $(OUTDIR)/bin/offapi.rdb \
+    $(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Package_clioootypesversion.mk b/unoil/Package_clioootypesversion.mk
new file mode 100644
index 000000000000..5da7493e851d
--- /dev/null
+++ b/unoil/Package_clioootypesversion.mk
@@ -0,0 +1,32 @@
+# -*- 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@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,unoil_clioootypesversion,$(SRCDIR)/unoil/climaker))
+
+$(eval $(call gb_Package_add_file,unoil_clioootypesversion,bin/clioootypesversion.mk,version.txt))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/Package_javamaker.mk b/unoil/Package_javamaker.mk
new file mode 100644
index 000000000000..7b7fcb7072d7
--- /dev/null
+++ b/unoil/Package_javamaker.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@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,unoil_javamaker,$(WORKDIR)/CustomTarget/unoil/javamaker))
+
+$(eval $(call gb_Package_add_customtarget,unoil_javamaker,unoil/javamaker))
+
+$(eval $(call gb_CustomTarget_add_outdir_dependencies,unoil/javamaker,\
+    $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
+    $(OUTDIR)/bin/offapi.rdb \
+    $(OUTDIR)/bin/udkapi.rdb \
+))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/unoil/climaker/Makefile b/unoil/climaker/Makefile
new file mode 100644
index 000000000000..0d029f7a8ae5
--- /dev/null
+++ b/unoil/climaker/Makefile
@@ -0,0 +1,64 @@
+# -*- 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@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_PARTIALBUILD := T
+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 $@ \
+		--assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
+		--assembly-company "LibreOffice" \
+		--assembly-description "This assembly contains metadata for the LibreOffice API." \
+		-X $(OUTDIR)/bin/udkapi.rdb \
+		-r $(OUTDIR)/bin/cli_uretypes.dll \
+		--keyfile $(OUTDIR)/bin/cliuno.snk \
+		$(OUTDIR)/bin/offapi.rdb) > /dev/null)
+
+cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config $(SRCDIR)/unoil/climaker/version.txt
+	$(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)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : \
+	cli_oootypes.dll \
+	cli_oootypes.config \
+	$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/climaker/makefile.mk b/unoil/climaker/makefile.mk
deleted file mode 100644
index d820e72d082e..000000000000
--- a/unoil/climaker/makefile.mk
+++ /dev/null
@@ -1,93 +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 = unoil
-
-# for dummy
-TARGET = unotypes
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-.INCLUDE : target.mk
-
-.INCLUDE : version.txt
-
-POLICY_ASSEMBLY_FILE=$(BIN)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
-
-.IF "$(BUILD_FOR_CLI)" != ""
-
-ALLTAR : \
-    $(BIN)$/clioootypesversion.mk \
-    $(BIN)$/cli_oootypes.dll \
-    $(POLICY_ASSEMBLY_FILE)
-
-.ELSE
-
-ALLTAR : \
-    $(BIN)$/clioootypesversion.mk 
-
-.ENDIF
-
-    
-CLIMAKERFLAGS =
-.IF "$(debug)" != ""
-CLIMAKERFLAGS += --verbose
-.ENDIF
-
-RDB = $(SOLARBINDIR)$/offapi.rdb
-EXTRA_RDB = $(SOLARBINDIR)$/udkapi.rdb
-
-$(BIN)/cli_oootypes.dll : $(RDB) $(EXTRA_RDB) version.txt
-        $(CLIMAKER) $(CLIMAKERFLAGS) \
-        --out $@ \
-         --assembly-version $(CLI_OOOTYPES_NEW_VERSION) \
-        --assembly-company "OpenOffice.org" \
-        --assembly-description "This assembly contains metadata for the StarOffice/OpenOffice.org API." \
-        -X $(EXTRA_RDB) \
-        -r $(SOLARBINDIR)$/cli_uretypes.dll \
-        --keyfile $(SOLARBINDIR)$/cliuno.snk \
-        $(RDB)
-        
-
-#Create the config file that is used with the policy assembly
-$(BIN)$/cli_oootypes.config: cli_oootypes_config version.txt
-    $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
-    $< $@
-
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_oootypes.config $(BIN)$/cli_oootypes.dll
-    $(WRAPCMD) AL.exe -out:$@ \
-            -version:$(CLI_OOOTYPES_POLICY_VERSION) \
-            -keyfile:$(SOLARBINDIR)$/cliuno.snk \
-            -link:$(BIN)$/cli_oootypes.config
-
-#always deliver a clioootypesversion.mk. It is needed for the packing process even for all other
-#platforms. Therefore BUILD_FOR_CLI is not used here 
-$(BIN)$/clioootypesversion.mk: version.txt
-    $(GNUCOPY) $< $@
-    
diff --git a/unoil/com/sun/star/deployment/ui/makefile.mk b/unoil/com/sun/star/deployment/ui/makefile.mk
deleted file mode 100644
index e8c4cb1aaff4..000000000000
--- a/unoil/com/sun/star/deployment/ui/makefile.mk
+++ /dev/null
@@ -1,33 +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.
-#
-#*************************************************************************
-
-PRJNAME = unoil
-PRJ = ..$/..$/..$/..$/..
-TARGET = unoil_deployment_ui
-PACKAGE = com$/sun$/star$/deployment$/ui
-
-.INCLUDE : $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/frame/status/makefile.mk b/unoil/com/sun/star/frame/status/makefile.mk
deleted file mode 100644
index 2739547fbe0b..000000000000
--- a/unoil/com/sun/star/frame/status/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-PRJNAME	= unoil
-PRJ		= ..$/..$/..$/..$/..
-TARGET	= unoil_framestatus
-PACKAGE	= com$/sun$/star$/frame$/status
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/graphic/makefile.mk b/unoil/com/sun/star/graphic/makefile.mk
deleted file mode 100755
index 1863ad61879d..000000000000
--- a/unoil/com/sun/star/graphic/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-PRJNAME	= unoil
-PRJ		= ..$/..$/..$/..
-TARGET	= unoil_graphic
-PACKAGE	= com$/sun$/star$/graphic
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/mail/makefile.mk b/unoil/com/sun/star/mail/makefile.mk
deleted file mode 100644
index 0db33e5b4a25..000000000000
--- a/unoil/com/sun/star/mail/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-PRJNAME	= unoil
-PRJ		= ..$/..$/..$/..
-TARGET	= unoil_mail
-PACKAGE	= com$/sun$/star$/mail
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/makefile.pmk
diff --git a/unoil/com/sun/star/media/makefile.mk b/unoil/com/sun/star/media/makefile.mk
deleted file mode 100644
index 74c5f52990cc..000000000000
--- a/unoil/com/sun/star/media/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-PRJNAME	= unoil
-PRJ		= ..$/..$/..$/..
-TARGET	= unoil_media
-PACKAGE = com$/sun$/star$/media
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/makefile.pmk
diff --git a/unoil/drafts/com/sun/star/frame/status/makefile.mk b/unoil/drafts/com/sun/star/frame/status/makefile.mk
deleted file mode 100644
index f5c93aaf61ac..000000000000
--- a/unoil/drafts/com/sun/star/frame/status/makefile.mk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-PRJNAME	= unoil
-PRJ	= ..$/..$/..$/..$/..$/..
-TARGET	= unoil_framestatus_drafts
-PACKAGE	= drafts$/com$/sun$/star$/frame$/status
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  $(PRJ)$/makefile.pmk
diff --git a/unoil/javamaker/Makefile b/unoil/javamaker/Makefile
new file mode 100644
index 000000000000..d39e96b984c9
--- /dev/null
+++ b/unoil/javamaker/Makefile
@@ -0,0 +1,40 @@
+# -*- 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@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_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 $@)
+
+.DEFAULT_GOAL := all
+.PHONY : all
+all : done
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/prj/build.lst b/unoil/prj/build.lst
index 15104e8ff6e8..5667774ac49d 100644
--- a/unoil/prj/build.lst
+++ b/unoil/prj/build.lst
@@ -1,4 +1,2 @@
 ul unoil :: DESKTOP:codemaker offapi ridljar solenv cli_ure NULL
-ul unoil\javamaker nmake - all ul_javamaker NULL
-ul unoil\util nmake - all ul_util ul_javamaker NULL
-ul unoil\climaker nmake - all  ul_climaker NULL
\ No newline at end of file
+ul unoil\prj nmake - all ul_prj NULL
diff --git a/unoil/prj/d.lst b/unoil/prj/d.lst
index b4ee5815d778..e69de29bb2d1 100644
--- a/unoil/prj/d.lst
+++ b/unoil/prj/d.lst
@@ -1,5 +0,0 @@
-..\%__SRC%\class\unoil.jar %_DEST%\bin\unoil.jar
-..\%__SRC%\bin\cli_oootypes.dll %_DEST%\bin\cli_oootypes.dll
-..\%__SRC%\bin\cli_oootypes.config %_DEST%\bin\cli_oootypes.config
-..\%__SRC%\bin\policy*.dll %_DEST%\bin\policy*.dll
-..\%__SRC%\bin\clioootypesversion.mk %_DEST%\bin\clioootypesversion.mk 
diff --git a/unoil/prj/makefile.mk b/unoil/prj/makefile.mk
new file mode 100644
index 000000000000..0997622e00f6
--- /dev/null
+++ b/unoil/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/unoil/util/makefile.mk b/unoil/util/makefile.mk
deleted file mode 100644
index c2bd22ef2733..000000000000
--- a/unoil/util/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	= unoil
-TARGET	= unoil
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE :  settings.mk
-
-MAXLINELENGTH = 100000
-
-JARCLASSDIRS	= com
-JARTARGET		= $(TARGET).jar
-JARCOMPRESS 	= TRUE
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE :  target.mk
diff --git a/unoil/util/makefile.pmk b/unoil/util/makefile.pmk
deleted file mode 100644
index 6a3ea0d706e4..000000000000
--- a/unoil/util/makefile.pmk
+++ /dev/null
@@ -1,35 +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.
-#
-#*************************************************************************
-
-# no translation here anyway
-.IF "$(L10N_framework)"==""
-.IF "$(COM)" == "MSC"
-BUILD_FOR_CLI = "true"
-CFLAGSENABLESYMBOLS:=-Z7
-.ENDIF
-.ENDIF			# "L10N_framework"==""
-