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

[Bjoern Michaelsen]

 solenv/gbuild/CppunitTest.mk  |    6 ++++++
 solenv/gbuild/CustomTarget.mk |    1 +
 2 files changed, 7 insertions(+)

New commits:
commit 7965685344ba410c73e1e5a325ecc7fe21c53bfb
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Apr 16 20:47:42 2011 +0200

    provide a rule for explicit deps

diff --git a/solenv/gbuild/CustomTarget.mk b/solenv/gbuild/CustomTarget.mk
index 97be0f2..a55ad80 100644
--- a/solenv/gbuild/CustomTarget.mk
+++ b/solenv/gbuild/CustomTarget.mk
@@ -67,6 +67,7 @@ $(foreach reponame,$(gb_CustomTarget_REPOSITORYNAMES),\
 	$(eval $(call gb_CustomTarget_get_repo_target,$(reponame),$(1)) : $(call gb_CustomTarget__get_makefile,$($(reponame)),$(1))))
 
 $(call gb_CustomTarget_get_workdir,$(1))/% : $(call gb_CustomTarget_get_target,$(1))
+	@true
 
 endef
 
commit c16c86f041072ef3a04afd94cfe09c60f5f1cc4d
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Sat Apr 16 20:10:00 2011 +0200

    add gb_CppunitTest_uses_ure for unittests using URE

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 6f61922..5613226 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -82,6 +82,12 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2)
 
 endef
 
+# 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)) : $(OUTDIR)/xml/ure/services.rdb
+
+endef
+
 define gb_CppunitTest__forward_to_Linktarget
 gb_CppunitTest_$(1) = $$(call gb_LinkTarget_$(1),$$(call gb_CppunitTest__get_linktargetname,$$(1)),$$(2),$$(3))