From 149cb468859e1f50e4a7ee1200f329791be97894 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Thu, 5 Apr 2012 22:57:22 +0200 Subject: gbuild: add customtarget dependencies for java stuff --- solenv/gbuild/JunitTest.mk | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) (limited to 'solenv/gbuild/JunitTest.mk') diff --git a/solenv/gbuild/JunitTest.mk b/solenv/gbuild/JunitTest.mk index 19b5e09c85ea..c861ea08b1ec 100644 --- a/solenv/gbuild/JunitTest.mk +++ b/solenv/gbuild/JunitTest.mk @@ -124,13 +124,23 @@ $(call gb_JunitTest_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(call endef +define gb_JunitTest_add_customtarget_dependency +$(call gb_JavaClassSet_add_customtarget_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) + +endef + +define gb_JunitTest_add_customtarget_dependencies +$(foreach dependency,$(2),$(call gb_JunitTest_add_customtarget_dependency,$(1),$(dependency))) + +endef + define gb_JunitTest_add_package_dependency $(call gb_JavaClassSet_add_package_dependency,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) endef define gb_JunitTest_add_package_dependencies -$(call gb_JavaClassSet_add_package_dependencies,$(call gb_JunitTest_get_classsetname,$(1)),$(2)) +$(foreach dependency,$(2),$(call gb_JunitTest_add_package_dependency,$(1),$(dependency))) endef @@ -152,6 +162,9 @@ gb_JunitTest_add_sourcefile := gb_JunitTest_add_sourcefiles := gb_JunitTest_add_jar := gb_JunitTest_add_jars := +gb_JunitTest_add_jar_classset := +gb_JunitTest_add_customtarget_dependency := +gb_JunitTest_add_customtarget_dependencies := gb_JunitTest_add_package_dependency := gb_JunitTest_add_package_dependencies := -- cgit