[Libreoffice-commits] .: solenv/gbuild

[Libreoffice Gerrit user]

 solenv/gbuild/Executable.mk      |   25 -------------------------
 solenv/gbuild/TargetLocations.mk |   25 +++++++++++++++++++++++++
 2 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit e4cb67b4dabe40fdf8ce703d6739db7863c52fb4
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Dec 30 18:13:09 2012 +0100

    these functions must be defined early
    
    ... because their result is assigned to variables in various gbuild
    classes.
    
    Change-Id: I07c0fc54e10ddd76a6246ac4e9ed56541c9c1257

diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk
index 4683d0e..403497e 100644
--- a/solenv/gbuild/Executable.mk
+++ b/solenv/gbuild/Executable.mk
@@ -169,29 +169,4 @@ $(call gb_Executable_get_runtime_target,$(1)) : $(2)
 
 endef
 
-# Get dependencies needed for running the executable
-#
-# This is not strictly necessary, but it makes the use more similar to
-# ExternalExecutable.
-#
-# gb_Executable_get_runtime_dependencies executable
-define gb_Executable_get_runtime_dependencies
-$(call gb_Executable_get_runtime_target,$(1))
-endef
-
-define gb_Executable__get_command
-$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!))
-$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
-    $(call gb_Executable_get_target_for_build,$(1))
-endef
-
-# Get complete command-line for running the executable
-#
-# This includes setting library path, if necessary.
-#
-# gb_Executable_get_command executable
-define gb_Executable_get_command
-$(strip $(call gb_Executable__get_command,$(1)))
-endef
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk
index b201fbb..539c0aa 100644
--- a/solenv/gbuild/TargetLocations.mk
+++ b/solenv/gbuild/TargetLocations.mk
@@ -343,6 +343,31 @@ define gb_StaticLibrary_get_filename
 $(patsubst $(1):%,%,$(filter $(1):%,$(gb_StaticLibrary_FILENAMES)))
 endef
 
+# Get dependencies needed for running the executable
+#
+# This is not strictly necessary, but it makes the use more similar to
+# ExternalExecutable.
+#
+# gb_Executable_get_runtime_dependencies executable
+define gb_Executable_get_runtime_dependencies
+$(call gb_Executable_get_runtime_target,$(1))
+endef
+
+define gb_Executable__get_command
+$(if $(filter NONE,$(gb_Executable_VALIDGROUPS)),,$(call gb_Output_error,executable group NONE does not exist!))
+$(if $(filter $(1),$(gb_Executable_NONE)),,$(gb_Helper_set_ld_path)) \
+    $(call gb_Executable_get_target_for_build,$(1))
+endef
+
+# Get complete command-line for running the executable
+#
+# This includes setting library path, if necessary.
+#
+# gb_Executable_get_command executable
+define gb_Executable_get_command
+$(strip $(call gb_Executable__get_command,$(1)))
+endef
+
 gb_Executable_get_linktargetname = Executable/$(1)$(gb_Executable_EXT)
 gb_Library_get_linktargetname = Library/$(call gb_Library_get_filename,$(1))
 gb_StaticLibrary_get_linktargetname = StaticLibrary/$(call gb_StaticLibrary_get_filename,$(1))