[Libreoffice-commits] .: 2 commits - solenv/gbuild

[David Tardon]

 solenv/gbuild/CppunitTest.mk |    3 ++-
 solenv/gbuild/RdbTarget.mk   |    2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit e0d583d9511bcc322727e438e4cf951138926eb3
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 24 09:49:15 2011 +0200

    depend on the used components

diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 53548dd..e8436eb 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -61,6 +61,7 @@ endif
 endef
 
 define gb_RdbTarget_add_component
+$(call gb_RdbTarget_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2))
 $(call gb_RdbTarget_get_target,$(1)) : COMPONENTS += $(2)
 $(call gb_RdbTarget_get_clean_target,$(1)) : COMPONENTS += $(2)
 endef
@@ -70,6 +71,7 @@ $(foreach component,$(2),$(eval $(call gb_RdbTarget_add_component,$(1),$(compone
 endef
 
 define gb_RdbTarget_add_old_component
+$(call gb_RdbTarget_get_target,$(1)) : $(call gb_RdbTarget__get_old_component_target,$(2))
 $(call gb_RdbTarget_get_target,$(1)) : OLD_COMPONENTS += $(2)
 $(call gb_RdbTarget_get_clean_target,$(1)) : OLD_COMPONENTS += $(2)
 endef
commit 58d7061a39533bd74ff74d9ab28c5b4aba179a6e
Author: David Tardon <dtardon at redhat.com>
Date:   Sun Apr 24 09:48:09 2011 +0200

    depend on udkapi.rdb too

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 0d3cc7f..d925b77 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -103,8 +103,9 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
 
 endef
 
-# Once we build the services.rdb with gbuild we should use its *_get_target method
+# TODO: Once we build the services.rdb with gbuild we should use its *_get_target method
 define gb_CppunitTest_uses_ure
+$(call gb_CppunitTest_get_target,$(1)) : $(call gb_CppunitTest__get_uno_type_target,udkapi)
 $(call gb_CppunitTest_get_target,$(1)) : $(OUTDIR)/xml/ure/services.rdb
 $(call gb_CppunitTest_get_target,$(1)) : URE := $(true)