tools: use CustomTarget makefile

4 files changed, 10 insertions, 40 deletions

diff --git a/tools/source/reversemap/Makefile b/tools/CustomTarget_reversemap.mk
index 5b427a8472b9..c15dc0e2e8df 100644
--- a/tools/source/reversemap/Makefile
+++ b/tools/CustomTarget_reversemap.mk
@@ -23,11 +23,15 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-all : reversemap.hxx
+$(eval $(call gb_CustomTarget_CustomTarget,tools/reversemap,new_style))
 
-include $(GBUILDDIR)/gbuild_simple.mk
+TLRM := $(call gb_CustomTarget_get_workdir,tools/reversemap)
 
-reversemap.hxx : $(OUTDIR_FOR_BUILD)/bin/bestreversemap
+$(call gb_CustomTarget_get_target,tools/reversemap) : $(TLRM)/reversemap.hxx
+
+$(TLRM)/reversemap.hxx : $(call gb_Executable_get_target_for_build,bestreversemap) \
+		| $(TLRM)/.dir
+	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),BRM,1)
 	$(call gb_Helper_execute,bestreversemap > $@)
 
 # vim: set noet sw=4 ts=4:
diff --git a/tools/Library_tl.mk b/tools/Library_tl.mk
index 003f4bbf9c62..988f569bbe2e 100644
--- a/tools/Library_tl.mk
+++ b/tools/Library_tl.mk
@@ -29,11 +29,11 @@
 $(eval $(call gb_Library_Library,tl))
 
 $(eval $(call gb_Library_add_package_headers,tl,tools_inc))
-$(eval $(call gb_Library_add_package_headers,tl,tools_reversemap))
+
+$(eval $(call gb_Library_add_custom_headers,tl,tools/reversemap))
 
 $(eval $(call gb_Library_set_include,tl,\
     -I$(SRCDIR)/tools/inc \
-    -I$(WORKDIR)/CustomTarget/tools/source/reversemap \
     $$(INCLUDE) \
 ))
 
diff --git a/tools/Module_tools.mk b/tools/Module_tools.mk
index 2feb9226e400..7d8b5234824a 100644
--- a/tools/Module_tools.mk
+++ b/tools/Module_tools.mk
@@ -30,9 +30,9 @@
 $(eval $(call gb_Module_Module,tools))
 
 $(eval $(call gb_Module_add_targets,tools,\
+    CustomTarget_reversemap \
     Library_tl \
     Package_inc \
-    Package_reversemap \
     StaticLibrary_ooopathutils \
 ))
 
diff --git a/tools/Package_reversemap.mk b/tools/Package_reversemap.mk
deleted file mode 100644
index 513fc01b39c6..000000000000
--- a/tools/Package_reversemap.mk
+++ /dev/null
@@ -1,34 +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. 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.
-#
-# The Initial Developer of the Original Code is
-#        Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.)
-# Portions created by the Initial Developer are Copyright (C) 2011 the
-# Initial Developer. All Rights Reserved.
-#
-# Contributor(s): Bjoern Michaelsen <bjoern.michaelsen@canonical.com> (Canonical Ltd.)
-#
-# 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,tools_reversemap,$(WORKDIR)/CustomTarget/tools/source/reversemap))
-$(eval $(call gb_Package_add_customtarget,tools_reversemap,tools/source/reversemap))
-
-$(eval $(call gb_CustomTarget_add_outdir_dependencies,tools/source/reversemap,\
-	$(call gb_Executable_get_target_for_build,bestreversemap) \
-))
-
-# vim: set noet sw=4 ts=4: