From 463ee0c0ac3753dee0bd155461f0288b3c12c7ba Mon Sep 17 00:00:00 2001
From: Michael Stahl <mstahl@redhat.com>
Date: Fri, 1 Nov 2013 14:02:02 +0100
Subject: gbuild: Executable: remove pointless indirection here too

gb_Executable__get_linktarget_target, gb_Executable_get_install_target
and gb_Executable_get_install_target_for_build

Change-Id: I1b0397c6982e885cd4834c2001264b1f6ae0a99c
---
 solenv/gbuild/Executable.mk      |  2 --
 solenv/gbuild/TargetLocations.mk | 25 +++++++++++--------------
 2 files changed, 11 insertions(+), 16 deletions(-)

(limited to 'solenv')

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 328b6398801d..974e1b30ff92 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -54,8 +54,6 @@ gb_Executable__get_dir_for_layer = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb
 gb_Executable__get_dir_for_layer_for_build = $(patsubst $(1):%,%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS_FOR_BUILD)))
 gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1)))
 gb_Executable__get_dir_for_exe_for_build = $(call gb_Executable__get_dir_for_layer_for_build,$(call gb_Executable_get_layer,$(1)))
-gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
-gb_Executable_get_install_target_for_build = $(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1))
 
 define gb_Executable_Executable
 $(call gb_Postprocess_register_target,AllExecutables,Executable,$(1))
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index 07408d2898f3..635145b82617 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -30,17 +30,6 @@ gb_PackagePart_get_destinations = \
 # kind of lame but with just 3 of these why bother with registration etc.
 gb_UnoApi_get_target = $(INSTROOT)/$(if $(filter udkapi,$(1)),$(LIBO_URE_SHARE_FOLDER)/misc/types,$(LIBO_ETC_FOLDER)/types/$(1)).rdb
 
-# instdir target patterns
-
-gb_Executable_get_target = $(gb_Executable__get_linktarget_target)
-
-ifneq ($(CROSS_COMPILING),)
-# Can we assume this is used only for executables registered for "NONE"?
-gb_Executable_get_target_for_build = $(call gb_Executable_get_install_target_for_build,$(1))
-else
-gb_Executable_get_target_for_build = $(gb_Executable__get_linktarget_target)
-endif
-
 # workdir target patterns
 
 gb_AutoInstall_get_target = $(WORKDIR)/AutoInstall/$(1)
@@ -365,11 +354,19 @@ endef
 define gb_Executable__get_workdir_linktargetname
 Executable/$(call gb_Executable_get_filename,$(1))
 endef
-define gb_Executable__get_linktarget_target
-$(call gb_Executable_get_install_target,$(1))
+define gb_Executable_get_target
+$(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1))
 endef
+ifneq ($(CROSS_COMPILING),)
+# Can we assume this is used only for executables registered for "NONE"?
+define gb_Executable_get_target_for_build
+$(call gb_Executable__get_dir_for_exe_for_build,$(1))/$(call gb_Executable_get_filename,$(1))
+endef
+else
+gb_Executable_get_target_for_build = $(gb_Executable_get_target)
+endif # CROSS_COMPILING
 define gb_Executable_get_linktarget
-$(call gb_Executable__get_workdir_linktargetname,$(1))<>$(call gb_Executable__get_linktarget_target,$(1))
+$(call gb_Executable__get_workdir_linktargetname,$(1))<>$(call gb_Executable_get_target,$(1))
 endef
 
 define gb_Library__get_workdir_linktargetname
-- 
cgit