provide an easy way to depend on makefile from gbuild classes

$(lastword $(MAKEFILE_LIST)) is not what is expected if the makefile
includes other makefile as the first step (as some do). See
UnpackedTarball.mk, where I already tried to workaround the problem.

Change-Id: Ib713a698f52ba16f46fbbc4c50b43edd69c9a472

solenv/gbuild/HelpTarget.mk

@@ -73,7 +73,7 @@ define gb_HelpTranslatePartTarget_HelpTranslatePartTarget
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) : HELP_LANG := $(2)
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) : POFILES := $(gb_POLOCATION)/$(2)/$(3).po
 
-$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
+$(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) : $(gb_POLOCATION)/$(2)/$(3).po
 $(gb_POLOCATION)/$(2)/$(3).po :
 $(call gb_HelpTranslatePartTarget_get_target,$(1)) :| $(dir $(call gb_HelpTranslatePartTarget_get_target,$(1))).dir
@@ -312,7 +312,6 @@ $(call gb_HelpLinkTarget_get_clean_target,%) :
 #
 # gb_HelpLinkTarget_HelpLinkTarget name module lang workdir
 define gb_HelpLinkTarget_HelpLinkTarget
-$(call gb_HelpLinkTarget_get_target,$(1)) : $(lastword $(MAKEFILE_LIST))
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_ADD_FILES :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_CONFIGDIR :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_EXTRA_ADD_FILES :=
@@ -325,6 +324,7 @@ $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_SRCDIR :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_TREE :=
 $(call gb_HelpLinkTarget_get_target,$(1)) : HELP_WORKDIR := $(4)
 
+$(call gb_HelpLinkTarget_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_HelpLinkTarget_get_target,$(1)) :| $(dir $(call gb_HelpLinkTarget_get_target,$(1))).dir
 
 endef
@@ -558,7 +558,7 @@ $(call gb_HelpTarget_get_target,$(1)) : HELP_LANG := $(3)
 $(call gb_HelpTarget_get_target,$(1)) : HELP_PACK_FILES :=
 
 $(call gb_HelpTarget_get_translation_target,$(1)) : HELP_FILES :=
-$(call gb_HelpTarget_get_translation_target,$(1)) : $(lastword $(MAKEFILE_LIST))
+$(call gb_HelpTarget_get_translation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 
 $(call gb_HelpTarget__HelpTarget_impl,$(1),$(2),$(3),$(call gb_HelpTarget_get_workdir,$(1)))
 

solenv/gbuild/JavaClassSet.mk

@@ -71,10 +71,10 @@ $(call gb_JavaClassSet_get_preparation_target,%) :
 # depend on makefile to enforce a rebuild if files are removed from the classset
 define gb_JavaClassSet_JavaClassSet
 $(call gb_JavaClassSet_get_target,$(1)) : \
-	$(lastword $(MAKEFILE_LIST)) \
+	$(gb_Module_CURRENTMAKEFILE) \
 	$(call gb_JavaClassSet_get_preparation_target,$(1))
 $(call gb_JavaClassSet_get_target,$(1)) : JARDEPS := \
-	$(lastword $(MAKEFILE_LIST)) \
+	$(gb_Module_CURRENTMAKEFILE) \
 	$(call gb_JavaClassSet_get_preparation_target,$(1))
 
 endef

solenv/gbuild/Module.mk

@@ -54,6 +54,14 @@ gb_Module_SLOWCHECKTARGETSTACK :=
 gb_Module_SUBSEQUENTCHECKTARGETSTACK :=
 gb_Module_CLEANTARGETSTACK :=
 
+# The currently read gbuild makefile.
+#
+# gbuild classes should use this if they need to depend on their makefile
+# (e.g., to make sure a zip file is rebuilt if files are removed from it).
+# Because makefiles may include other makefiles, it is not safe to rely
+# on $(MAKEFILE_LIST).
+gb_Module_CURRENTMAKEFILE :=
+
 .PHONY : $(call gb_Module_get_clean_target,%)
 $(call gb_Module_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),MOD,5)
@@ -187,7 +195,9 @@ endef
 define gb_Module__read_targetfile
 gb_Module_CURRENTTARGET :=
 gb_Module_CURRENTCLEANTARGET :=
+gb_Module_CURRENTMAKEFILE := $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
 include $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk
+gb_Module_CURRENTMAKEFILE :=
 ifneq ($$(words $$(gb_Module_CURRENTTARGET)) $$(words $$(gb_Module_CURRENTCLEANTARGET)),1 1)
 $$(eval $$(call gb_Output_error,No $(3) registered while reading $(patsubst $(1):%,%,$(filter $(1):%,$(gb_Module_MODULELOCATIONS)))$(2).mk!))
 endif

solenv/gbuild/Pagein.mk

@@ -56,7 +56,7 @@ $(call gb_Pagein_get_target,%) :
 	
 define gb_Pagein_Pagein
 $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
-$(call gb_Pagein_get_target,$(1)) : $(realpath $(lastword $(MAKEFILE_LIST)))
+$(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $$(eval $$(call gb_Module_register_target,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_outdir_target,$(1)))
 $(call gb_Deliver_add_deliverable,$(call gb_Pagein_get_outdir_target,$(1)),$(call gb_Pagein_get_target,$(1)),$(1))

solenv/gbuild/UnpackedTarball.mk

@@ -185,11 +185,6 @@ $(call gb_UnpackedTarball_get_clean_target,%) :
 			$(call gb_UnpackedTarball_get_pristine_dir,$*) \
 	)
 
-define gb_UnpackedTarball__get_makefile
-$(lastword $(foreach makefile,$(MAKEFILE_LIST),$(if $(filter UnpackedTarball_%,$(notdir $(makefile))),$(makefile))))
-
-endef
-
 # Initialize unpacked tarball
 define gb_UnpackedTarball_UnpackedTarball_internal
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_DESTFILES :=
@@ -199,7 +194,7 @@ $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHES :=
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_PATCHLEVEL := $(gb_UnpackedTarball_PATCHLEVEL_DEFAULT)
 $(call gb_UnpackedTarball_get_target,$(1)) : UNPACKED_POST_ACTION :=
 
-$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(call gb_UnpackedTarball__get_makefile)
+$(call gb_UnpackedTarball_get_preparation_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 $(call gb_UnpackedTarball_get_preparation_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir
 $(call gb_UnpackedTarball_get_target,$(1)) : $(call gb_UnpackedTarball_get_preparation_target,$(1))
 $(call gb_UnpackedTarball_get_target,$(1)) :| $(dir $(call gb_UnpackedTarball_get_target,$(1))).dir

solenv/gbuild/Zip.mk

@@ -92,7 +92,7 @@ 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))
+$(call gb_Zip_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
 
 $(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,$(call gb_Zip_get_final_target,$(1)))