diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-02-26 15:19:47 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-02-26 15:45:12 +0100 |
| commit | c81e40d02610b665a9edcc73b57ac7e783913988 (patch) | |
| tree | 9e3ddb01b74b183795b3854b64b87463d25f16fa /solenv | |
| parent | 34faec549ef33f77c4f866a4094d9fcf447025ee (diff) | |
gbuild: Zip/Jar targets: depend on makefile to rebuild on removal
Change-Id: I0b79b6c9018e4513b9f0b16be3e57f620d12ea23
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/JavaClassSet.mk | 9 | ||||
| -rw-r--r-- | solenv/gbuild/Zip.mk | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk index fab3ae437cd0..2a81a870846c 100644 --- a/solenv/gbuild/JavaClassSet.mk +++ b/solenv/gbuild/JavaClassSet.mk @@ -68,9 +68,14 @@ $(call gb_JavaClassSet_get_clean_target,%) : $(call gb_JavaClassSet_get_preparation_target,%) : mkdir -p $(dir $@) && touch $@ +# depend on makefile to enforce a rebuild if files are removed from the classset define gb_JavaClassSet_JavaClassSet -$(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)) : \ + $(lastword $(MAKEFILE_LIST)) \ + $(call gb_JavaClassSet_get_preparation_target,$(1)) +$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := \ + $(lastword $(MAKEFILE_LIST)) \ + $(call gb_JavaClassSet_get_preparation_target,$(1)) endef diff --git a/solenv/gbuild/Zip.mk b/solenv/gbuild/Zip.mk index 89ca8a694741..2685ce33d26c 100644 --- a/solenv/gbuild/Zip.mk +++ b/solenv/gbuild/Zip.mk @@ -89,8 +89,10 @@ $(call gb_Zip_get_outdir_target,$(1)) : $(call gb_Zip_get_target,$(1)) \ endef +# depend on makefile to enforce a rebuild if files are removed from the zip define gb_Zip_Zip $(call gb_Zip_Zip_internal,$(1),$(2)) +$(call gb_Zip_get_target,$(1)) : $(lastword $(MAKEFILE_LIST)) $(eval $(call gb_Module_register_target,$(call gb_Zip_get_final_target,$(1)),$(call gb_Zip_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),Zip) |