diff options
| author | David Tardon <dtardon@redhat.com> | 2011-12-25 13:28:36 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-12-25 13:33:31 +0100 |
| commit | d785722ae136801aee0f7d0b2bde7baaac2ae5b6 (patch) | |
| tree | 8aaa333cbdf4afeefd5b25355d3a96144785c2aa /solenv | |
| parent | add add_package_dependencies for JunitTest too (diff) | |
| download | core-d785722ae136801aee0f7d0b2bde7baaac2ae5b6.tar.gz core-d785722ae136801aee0f7d0b2bde7baaac2ae5b6.zip | |
don't let jars depend on random stuff
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index 100976f231c5..43e3dac669cb 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -29,11 +29,8 @@ gb_JavaClassSet_JAVACCOMMAND := $(JAVACOMPILER) gb_JavaClassSet_JAVACDEBUG := -# Enforce dependency ordering. -# -# This target is used to enforce correct dependency order for possibly -# generated stuff: generated sources, jars/classdirs etc. Everything but -# source files depends on it. +# Enforces correct dependency order for possibly generated stuff: +# generated sources, jars/classdirs etc. gb_JavaClassSet_get_preparation_target = $(WORKDIR)/JavaClassSet/$(1)/prepared ifneq ($(gb_DEBUGLEVEL),0) @@ -71,8 +68,8 @@ $(call gb_JavaClassSet_get_preparation_target,%) : mkdir -p $(dir $@) && touch $@ define gb_JavaClassSet_JavaClassSet -$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := -$(call gb_JavaClassSet_get_target,$(1)) :| $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(call gb_JavaClassSet_get_target,$(1)) : $(call gb_JavaClassSet_get_preparation_target,$(1)) endef @@ -116,7 +113,7 @@ define gb_JavaClassSet_add_jar $(call gb_JavaClassSet_get_target,$(1)) : $(2) $(call gb_JavaClassSet_get_target,$(1)) : T_CP := $$(T_CP)$(gb_CLASSPATHSEP)$(strip $(2)) $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS += $(2) -$(2) :| $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(2) :| $(gb_Helper_PHONY) endef |