gbuild: remove gb_Pagein__get_final_target

Change-Id: Ie3fcd7330e4e9f9d3ab48227edd192984d7ec49a

solenv/gbuild/Helper.mk

@@ -209,6 +209,12 @@ $(2) : $(3) | $(dir $(2)).dir
 $(call gb_Deliver_add_deliverable,$(2),$(3),$(2))
 endef
 
+# use if the installed target is the final target
+define gb_Helper_install_final
+$(1) : $(2) | $(dir $(1)).dir
+$(call gb_Deliver_add_deliverable,$(1),$(2),$(1))
+endef
+
 # 4th parameter overrides 3rd for the dependency, necessary for Library
 # which needs to copy DLL but that must not be a real target...
 define gb_Library__install

solenv/gbuild/Pagein.mk

@@ -19,7 +19,6 @@ gb_Pagein__make_path = \
 $(if $(call gb_Pagein__is_library,$(1)),$(call gb_Pagein__make_library_path,$(1)),$(1))
 
 gb_Pagein__get_install_target = $(gb_INSTROOT)/$(gb_PROGRAMDIRNAME)/pagein-$(1)
-gb_Pagein__get_final_target = $(WORKDIR)/Pagein/pagein-$(1).final
 
 define gb_Pagein__command
 $(call gb_Output_announce,$(2),$(true),PAG,5)
@@ -34,22 +33,18 @@ endef
 $(call gb_Pagein_get_clean_target,%) :
 	$(call gb_Output_announce,$*,$(false),PAG,5)
 	$(call gb_Helper_abbreviate_dirs,\
-        rm -f $(call gb_Pagein__get_final_target,$*) $(call gb_Pagein_get_target,$*))
+        rm -f $(call gb_Pagein__get_install_target,$*) $(call gb_Pagein_get_target,$*))
 
 $(call gb_Pagein_get_target,%) :
 	$(call gb_Pagein__command,$@,$*,$^)
 
-$(call gb_Pagein__get_final_target,%) :
-	touch $@
-
 define gb_Pagein_Pagein
 $(call gb_Pagein_get_target,$(1)) : OBJECTS :=
 $(call gb_Pagein_get_target,$(1)) : $(gb_Module_CURRENTMAKEFILE)
-$(call gb_Pagein__get_final_target,$(1)) : $(call gb_Pagein_get_target,$(1))
-$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_final_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Pagein__get_install_target,$(1)),$(call gb_Pagein_get_clean_target,$(1))))
 $(call gb_Helper_make_userfriendly_targets,$(1),Pagein,$(call gb_Pagein_get_target,$(1)))
 
-$(call gb_Helper_install,$(call gb_Pagein__get_final_target,$(1)), \
+$(call gb_Helper_install_final, \
 	$(call gb_Pagein__get_install_target,$(1)), \
 	$(call gb_Pagein_get_target,$(1)))