diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-18 14:12:16 +0200 |
| commit | 6f0d3f2a5b72673086f82a88831535e535885998 (patch) | |
| tree | 95f35abd15a9842442e432cd064aea92288393d3 /solenv/gbuild/JavaClassSet.mk | |
| parent | 01a601fb2a7a3872599186ffb8c4c4be1500e678 (diff) | |
fixing rebase errors
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 184a14a8b4d8..ba9e445026fb 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -38,18 +38,18 @@ $(call gb_Helper_abbreviate_dirs_native,\ endef -$(call gb_JavaClassSet_get_clean_target,%) : vaClassSet_get_target,%) : +$(call gb_JavaClassSet_get_clean_target,%) : $(call gb_Output_announce,$*,$(true),JCS,3) $(call gb_JavaClassSet__command,$@,$*,$?,$^) -$(call gb_Output_announce,$*,$(false),JCS,3) +$(call gb_JavaClassSet_get_clean_target,%) : + $(call gb_Output_announce,$*,$(false),JCS,3) $(call gb_Helper_abbreviate_dirs,\ rm -rf $(dir $(call gb_JavaClassSet_get_target,$*))) # no initialization of scoped variable CLASSPATH as it is "inherited" from controlling instance (e.g. JUnitTest, Jar) # UGLY: cannot use target local variable for REPO because it's needed in prereq define gb_JavaClassSet_JavaClassSet -$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := $(if $(filter $(2),$(gb_JavaClassSet_REPOSITORYNAMES)),,\ $(error JavaClassSet: no or invalid repository given; known repositories: \ $(gb_JavaClassSet_REPOSITORYNAMES))) |