4 files changed, 12 insertions, 48 deletions
diff --git a/ridljar/javamaker/Makefile b/ridljar/CustomTarget_javamaker.mk
index d2fe741f5f7e..ef72abdc0166 100644
--- a/ridljar/javamaker/Makefile
+++ b/ridljar/CustomTarget_javamaker.mk
@@ -25,15 +25,16 @@
 # 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,ridljar/javamaker,new_style))
 
-done : $(OUTDIR)/bin/udkapi.rdb
-	$(call gb_Helper_abbreviate_dirs_native, \
-	$(call gb_Helper_execute,javamaker -BUCR -O./class $<) && touch $@)
+RJJM := $(call gb_CustomTarget_get_workdir,ridljar/javamaker)
+
+$(call gb_CustomTarget_get_target,ridljar/javamaker) : $(RJJM)/done
 
-.DEFAULT_GOAL := all
-.PHONY : all
-all : done
+$(RJJM)/done : $(OUTDIR)/bin/udkapi.rdb \
+		$(call gb_Executable_get_target_for_build,javamaker) | $(RJJM)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),JVM,1)
+	$(call gb_Helper_abbreviate_dirs_native, \
+	$(call gb_Helper_execute,javamaker -BUCR -O$(RJJM)/class $<) && touch $@)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/ridljar/Jar_ridl.mk b/ridljar/Jar_ridl.mk
index b4c60e344291..0dacfc36a7fd 100644
--- a/ridljar/Jar_ridl.mk
+++ b/ridljar/Jar_ridl.mk
@@ -27,8 +27,8 @@
 
 $(eval $(call gb_Jar_Jar,ridl))
 
-$(eval $(call gb_Jar_add_package_dependencies,ridl,\
-    ridljar_javamaker \
+$(eval $(call gb_Jar_add_customtarget_dependencies,ridl,\
+    ridljar/javamaker \
 ))
 
 $(eval $(call gb_Jar_add_jars,ridl,\
diff --git a/ridljar/Module_ridljar.mk b/ridljar/Module_ridljar.mk
index dde756f983b7..206e73599cf9 100644
--- a/ridljar/Module_ridljar.mk
+++ b/ridljar/Module_ridljar.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Module_Module,ridljar))
 
 ifneq ($(SOLAR_JAVA),)
 $(eval $(call gb_Module_add_targets,ridljar,\
+    CustomTarget_javamaker \
     Jar_ridl \
     Jar_unoloader \
-    Package_javamaker \
     Zip_ridl \
     Zip_unoloader \
 ))
diff --git a/ridljar/Package_javamaker.mk b/ridljar/Package_javamaker.mk
deleted file mode 100644
index 2d73aeaf4d7b..000000000000
--- a/ridljar/Package_javamaker.mk
+++ /dev/null
@@ -1,37 +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,ridljar_javamaker,$(WORKDIR)/CustomTarget/ridljar/javamaker))
-
-$(eval $(call gb_Package_add_customtarget,ridljar_javamaker,ridljar/javamaker))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,ridljar/javamaker,\
-    $(OUTDIR_FOR_BUILD)/bin/javamaker$(gb_Executable_EXT_for_build) \
-    $(OUTDIR)/bin/udkapi.rdb \
-))
-
-# vim:set shiftwidth=4 softtabstop=4 expandtab: