diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-14 12:48:20 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-15 21:32:36 +0200 |
| commit | 944f3a6c6e48f1b5532fa16ab38918b9b3f9412e (patch) | |
| tree | 83901ce06673b80d2174196d9189367eea75c0bd /solenv/gbuild/Executable.mk | |
| parent | 7369a8cad62ba6151ba8c16c41d0005fdf87f0ec (diff) | |
gbuild: allow to use RepositoryFixes also for executables
Helps to kill package in cpputools.
And autoinstall uno executable.
Change-Id: Ib1d546371ec8d2b06381d88eff98dbc5b70da400
Diffstat (limited to 'solenv/gbuild/Executable.mk')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index 2caa7d2bae0f..06541dd10c3c 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -33,7 +33,7 @@ $(dir $(call gb_Executable_get_runtime_target,%)).dir : $(dir $(call gb_Executable_get_runtime_target,%))%/.dir : $(if $(wildcard $(dir $@)),,mkdir -p $(dir $@)) -$(call gb_Executable_get_runtime_target,%) : $(call gb_Executable_get_target_for_build,%) +$(call gb_Executable_get_runtime_target,%) : touch $@ .PHONY : $(call gb_Executable_get_clean_target,%) @@ -54,7 +54,7 @@ ifeq (,$$(findstring $(1),$$(gb_Executable_KNOWN))) $$(eval $$(call gb_Output_info,Currently known executables: $(sort $(gb_Executable_KNOWN)),ALL)) $$(eval $$(call gb_Output_error,Executable $(1) must be registered in Repository.mk)) endif -$(call gb_Executable__Executable_impl,$(1),Executable/$(1)$(gb_Executable_EXT)) +$(call gb_Executable__Executable_impl,$(1),$(call gb_Executable_get_linktargetname,$(1))) endef @@ -65,6 +65,7 @@ $(call gb_LinkTarget_add_libs,$(2),$(gb_STDLIBS)) $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ | $(dir $(call gb_Executable_get_target,$(1))).dir $(call gb_Executable_get_runtime_target,$(1)) :| $(dir $(call gb_Executable_get_runtime_target,$(1))).dir +$(call gb_Executable_get_runtime_target,$(1)) : $(call gb_Executable_get_target_for_build,$(1)) $(call gb_Executable_get_clean_target,$(1)) : $(call gb_LinkTarget_get_clean_target,$(2)) $(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_Executable_platform,$(1),$(2)) @@ -94,7 +95,7 @@ $(call gb_Executable_get_clean_target,$(1)) : $(call gb_Package_get_clean_target endef define gb_Executable_set_targettype_gui -$(call gb_LinkTarget_get_target,Executable/$(1)$(gb_Executable_EXT)) : TARGETGUI := $(2) +$(call gb_LinkTarget_get_target,$(call gb_Executable_get_linktargetname,$(1))) : TARGETGUI := $(2) endef # The auxtarget is delivered via the rule in Package.mk. |