diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 11:54:50 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-06-22 11:54:50 +0200 |
| commit | e65e22a96757e07509eb44d36f0397579e2c4d5e (patch) | |
| tree | be8f5c70d6b45a1cff094b25d1bbf8c5b6ab5de0 /solenv/gbuild/JavaClassSet.mk | |
| parent | d3c9cb684d9328addb6283291f1f11f269b7fe7d (diff) | |
gnumake4: fix JavaClassSet clean target
Diffstat (limited to 'solenv/gbuild/JavaClassSet.mk')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 454caac45768..e2ce686083f1 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -31,14 +31,17 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) define gb_JavaClassSet__command $(call gb_Helper_abbreviate_dirs_native,\ mkdir -p $(dir $(1)) && \ - $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) -cp "$(CLASSPATH)" -d $(call gb_JavaClassSet_get_classdir,$(2)) $(if $(filter-out $(JARDEPS),$(3)),\ + $(if $(3),$(gb_JavaClassSet_JAVACCOMMAND) \ + -cp "$(CLASSPATH)" \ + -d $(call gb_JavaClassSet_get_classdir,$(2)) \ + $(if $(filter-out $(JARDEPS),$(3)),\ $(filter-out $(JARDEPS),$(3)),\ $(filter-out $(JARDEPS),$(4))) &&) \ touch $(1)) endef -$(call gb_JavaClassSet_get_clean_target,%) : +$(call gb_JavaClassSet_get_target,%) : $(call gb_Output_announce,$*,$(true),JCS,3) $(call gb_JavaClassSet__command,$@,$*,$?,$^) |