diff options
Diffstat (limited to 'solenv/gbuild/Pyuno.mk')
| -rw-r--r-- | solenv/gbuild/Pyuno.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/solenv/gbuild/Pyuno.mk b/solenv/gbuild/Pyuno.mk index 25f8c8fe9485..b9ccb49a3e2e 100644 --- a/solenv/gbuild/Pyuno.mk +++ b/solenv/gbuild/Pyuno.mk @@ -23,10 +23,13 @@ $(call gb_Pyuno_get_target,%) : $(call gb_Output_announce,$*,$(true),PYU,3) touch $@ +$(call gb_Pyuno_get_final_target,%) : + touch $@ + .PHONY : $(call gb_Pyuno_get_clean_target,%) $(call gb_Pyuno_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),PYU,3) - rm -f $(call gb_Pyuno_get_target,$*) + rm -f $(call gb_Pyuno_get_target,$*) $(call gb_Pyuno_get_final_target,$*) gb_Pyuno_get_packagename = Pyuno/$(1) @@ -34,12 +37,13 @@ gb_Pyuno_get_packagename = Pyuno/$(1) define gb_Pyuno_Pyuno $(call gb_Package_Package_internal,$(call gb_Pyuno_get_packagename,$(1)),$(2)) +$(call gb_Pyuno_get_final_target,$(1)) : $(call gb_Pyuno_get_target,$(1)) $(call gb_Pyuno_get_target,$(1)) : $(call gb_Package_get_target,$(call gb_Pyuno_get_packagename,$(1))) $(call gb_Pyuno_get_target,$(1)) :| $(dir $(call gb_Pyuno_get_target,$(1))).dir $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_Package_get_clean_target,$(call gb_Pyuno_get_packagename,$(1))) -$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1)))) -$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno) +$$(eval $$(call gb_Module_register_target,$(call gb_Pyuno_get_final_target,$(1)),$(call gb_Pyuno_get_clean_target,$(1)))) +$(call gb_Helper_make_userfriendly_targets,$(1),Pyuno,$(call gb_Pyuno_get_final_target,$(1))) endef @@ -59,7 +63,8 @@ gb_Pyuno__COMPONENTPREFIX := vnd.openoffice.pymodule: define gb_Pyuno_set_componentfile_full $(call gb_ComponentTarget_ComponentTarget,$(2),$(3),$(4)) -$(call gb_Pyuno_get_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) +$(call gb_Pyuno_get_final_target,$(1)) : $(call gb_ComponentTarget_get_target,$(2)) +$(call gb_ComponentTarget_get_target,$(2)) : $(call gb_Pyuno_get_target,$(1)) $(call gb_Pyuno_get_clean_target,$(1)) : $(call gb_ComponentTarget_get_clean_target,$(2)) endef |