unoil: use CustomTarget makefiles

6 files changed, 33 insertions, 77 deletions

diff --git a/unoil/climaker/Makefile b/unoil/CustomTarget_climaker.mk
index 0d029f7a8ae5..462a2b81dacc 100644
--- a/unoil/climaker/Makefile
+++ b/unoil/CustomTarget_climaker.mk
@@ -25,12 +25,22 @@
 # 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
+$(eval $(call gb_CustomTarget_CustomTarget,unoil/climaker,new_style))
+
+UICM := $(call gb_CustomTarget_get_workdir,unoil/climaker)
+
+$(call gb_CustomTarget_get_target,unoil/climaker) : \
+	$(UICM)/cli_oootypes.dll \
+	$(UICM)/cli_oootypes.config \
+	$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll
 
 include $(SRCDIR)/unoil/climaker/version.txt
 
-cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
+$(UICM)/cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt \
+		$(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
+		$(OUTDIR)/bin/cliuno.snk $(OUTDIR)/bin/cli_uretypes.dll \
+		$(call gb_Executable_get_target_for_build,climaker) | $(UICM)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CLM,1)
 	$(call gb_Helper_abbreviate_dirs_native, \
 	$(call gb_Helper_execute,climaker \
 		$(if $(filter -s,$(MAKEFLAGS)),,--verbose) \
@@ -43,22 +53,19 @@ cli_oootypes.dll : $(SRCDIR)/unoil/climaker/version.txt
 		--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
+$(UICM)/cli_oootypes.config : $(SRCDIR)/unoil/climaker/cli_oootypes_config \
+		$(SRCDIR)/unoil/climaker/version.txt | $(UICM)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1)
 	$(call gb_Helper_abbreviate_dirs_native, \
 	perl $(SRCDIR)/solenv/bin/clipatchconfig.pl $^ $@)
 
-$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : cli_oootypes.dll cli_oootypes.config
+$(UICM)/$(CLI_OOOTYPES_POLICY_ASSEMBLY).dll : $(UICM)/cli_oootypes.config \
+		$(UICM)/cli_oootypes.dll $(OUTDIR)/bin/cliuno.snk
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AL ,1)
 	$(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
+		-link:$<)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/unoil/javamaker/Makefile b/unoil/CustomTarget_javamaker.mk
index f2391564b0e3..636a65dfdd6b 100644
--- a/unoil/javamaker/Makefile
+++ b/unoil/CustomTarget_javamaker.mk
@@ -25,16 +25,17 @@
 # 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
+$(eval $(call gb_CustomTarget_CustomTarget,unoil/javamaker,new_style))
 
-done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build)
+UIJM := $(call gb_CustomTarget_get_workdir,unoil/javamaker)
+
+$(call gb_CustomTarget_get_target,unoil/javamaker) : $(UIJM)/done
+
+$(UIJM)/done : $(OUTDIR)/bin/offapi.rdb $(OUTDIR)/bin/udkapi.rdb \
+		$(call gb_Executable_get_target_for_build,javamaker) | $(UIJM)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
 	$(call gb_Helper_abbreviate_dirs_native, \
-	$(call gb_Helper_execute,javamaker -BUCR -O. $(OUTDIR)/bin/offapi.rdb -X$(OUTDIR)/bin/udkapi.rdb) && \
+	$(call gb_Helper_execute,javamaker -BUCR -O$(UIJM) $(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/Jar_unoil.mk b/unoil/Jar_unoil.mk
index edc0471ee6b3..ff8f286f6d98 100644
--- a/unoil/Jar_unoil.mk
+++ b/unoil/Jar_unoil.mk
@@ -27,8 +27,8 @@
 
 $(eval $(call gb_Jar_Jar,unoil))
 
-$(eval $(call gb_Jar_add_package_dependencies,unoil,\
-    unoil_javamaker \
+$(eval $(call gb_Jar_add_customtarget_dependencies,unoil,\
+    unoil/javamaker \
 ))
 
 $(eval $(call gb_Jar_add_packagedirs,unoil,\
diff --git a/unoil/Module_unoil.mk b/unoil/Module_unoil.mk
index 826e5a712c38..40e7cdd48a9e 100644
--- a/unoil/Module_unoil.mk
+++ b/unoil/Module_unoil.mk
@@ -33,13 +33,14 @@ $(eval $(call gb_Module_add_targets,unoil,\
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,unoil,\
+    CustomTarget_javamaker \
     Jar_unoil \
-    Package_javamaker \
 ))
 endif
 
 ifeq ($(COM),MSC)
 $(eval $(call gb_Module_add_targets,unoil,\
+    CustomTarget_climaker \
     Package_climaker \
 ))
 endif
diff --git a/unoil/Package_climaker.mk b/unoil/Package_climaker.mk
index 0be46d0476cc..1b92759829d7 100644
--- a/unoil/Package_climaker.mk
+++ b/unoil/Package_climaker.mk
@@ -27,23 +27,8 @@
 
 $(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_javamaker.mk b/unoil/Package_javamaker.mk
deleted file mode 100644
index 7b7fcb7072d7..000000000000
--- a/unoil/Package_javamaker.mk
+++ /dev/null
@@ -1,38 +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@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: