summaryrefslogtreecommitdiff
path: root/solenv/gbuild/CliUnoApi.mk
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2012-12-30 13:11:43 +0100
committerDavid Tardon <dtardon@redhat.com>2012-12-30 17:15:49 +0100
commitceb0d0635c7dcdca577d20887c6cdd37517697d1 (patch)
tree5f5a2797b11f1ea59be0ae3711c531134904fe4d /solenv/gbuild/CliUnoApi.mk
parent7cdd83467a51c4a83b43ddc01e645dcc0fd549cb (diff)
use runtime deps in gbuild classes
Change-Id: I007e0293c354d6f930dffb4a9a2c2df5640a673b
Diffstat (limited to 'solenv/gbuild/CliUnoApi.mk')
-rw-r--r--solenv/gbuild/CliUnoApi.mk12
1 files changed, 3 insertions, 9 deletions
diff --git a/solenv/gbuild/CliUnoApi.mk b/solenv/gbuild/CliUnoApi.mk
index f72a4e088343..92e599cb4efc 100644
--- a/solenv/gbuild/CliUnoApi.mk
+++ b/solenv/gbuild/CliUnoApi.mk
@@ -11,8 +11,8 @@
gb_CliUnoApiTarget_EXT := $(gb_CliAssembly_POLICYEXT)
-gb_CliUnoApiTarget_TARGET := $(call gb_Executable_get_target_for_build,climaker)
-gb_CliUnoApiTarget_COMMAND := $(gb_Helper_set_ld_path) $(gb_CliUnoApiTarget_TARGET)
+gb_CliUnoApiTarget_DEPS := $(call gb_Executable_get_runtime_dependencies,climaker)
+gb_CliUnoApiTarget_COMMAND := $(call gb_Executable_get_command,climaker)
define gb_CliUnoApiTarget__command
$(call gb_Output_announce,$(2),$(true),CLI,4)
@@ -35,13 +35,7 @@ $(dir $(call gb_CliUnoApiTarget_get_target,%)).dir :
$(dir $(call gb_CliUnoApiTarget_get_target,%))%/.dir :
$(if $(wildcard $(dir $@)),,mkdir -p $(dir $@))
-# TODO depending on the whole URE might be overkill, but I do not have a
-# Windows machine to debug it...
-$(call gb_CliUnoApiTarget_get_target,%) : \
- $(gb_CliUnoApiTarget_TARGET) \
- $(call gb_Library_get_target,$(gb_CPPU_ENV)_uno) \
- $(call gb_Package_get_target,cppuhelper_unorc) \
- $(call gb_Rdb_get_outdir_target,ure/services)
+$(call gb_CliUnoApiTarget_get_target,%) : $(gb_CliUnoApiTarget_DEPS)
$(call gb_CliUnoApiTarget__command,$@,$*,$<)
.PHONY : $(call gb_CliUnoApiTarget_get_clean_target,%)