diff options
| author | David Tardon <dtardon@redhat.com> | 2012-04-08 11:25:50 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2012-04-08 14:53:08 +0200 |
| commit | 79beb586474139c858ddb2881cf6aa20c6821cbe (patch) | |
| tree | 7b057db2feacdce757e026ec6d6170ff1c2581b1 | |
| parent | fe209e78db5df329f38363a23109dcec67f4abcf (diff) | |
we do not need to differentiate between type and service rdbs now
| -rw-r--r-- | solenv/gbuild/CppunitTest.mk | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk index 4eda559b7038..010f2d6fd4c2 100644 --- a/solenv/gbuild/CppunitTest.mk +++ b/solenv/gbuild/CppunitTest.mk @@ -137,7 +137,7 @@ $(call gb_CppunitTest_get_target,$(1)) : ARGS := $(2) endef define gb_CppunitTest_uses_ure -$(call gb_CppunitTest_use_service_rdb,$(1),ure/services) +$(call gb_CppunitTest_use_rdb,$(1),ure/services) $(call gb_CppunitTest_get_target,$(1)) : URE := $(true) endef @@ -176,10 +176,14 @@ endef define gb_CppunitTest_add_service_rdb $$(call gb_Output_error,\ - gb_CppunitTest_add_service_rdb: use gb_CppunitTest_use_service_rdb instead.) + gb_CppunitTest_add_service_rdb: use gb_CppunitTest_use_rdb instead.) endef define gb_CppunitTest_use_service_rdb +$$(call gb_Output_error,gb_CppunitTest_use_service_rdb: use gb_CppunitTest_use_rdb instead.)) +endef + +define gb_CppunitTest_use_rdb $(call gb_CppunitTest_get_target,$(1)) : $(call gb_Rdb_get_outdir_target,$(2)) $(call gb_CppunitTest_get_target,$(1)) : UNO_SERVICES += $(call gb_Rdb_get_outdir_target,$(2)) @@ -187,11 +191,15 @@ endef define gb_CppunitTest_add_service_rdbs $$(call gb_Output_error,\ - gb_CppunitTest_add_service_rdbs: use gb_CppunitTest_use_service_rdbs instead.) + gb_CppunitTest_add_service_rdbs: use gb_CppunitTest_use_rdbs instead.) endef define gb_CppunitTest_use_service_rdbs -$(foreach rdb,$(2),$(call gb_CppunitTest_use_service_rdb,$(1),$(rdb))) +$$(call gb_Output_error,gb_CppunitTest_use_service_rdbs: use gb_CppunitTest_use_rdbs instead.)) +endef + +define gb_CppunitTest_use_rdbs +$(foreach rdb,$(2),$(call gb_CppunitTest_use_rdb,$(1),$(rdb))) endef |