diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2013-06-18 23:34:59 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-09 22:09:15 +0200 |
| commit | 64405aa69f3c4e305f11f2d3ddbddd2bbedbb264 (patch) | |
| tree | f33b5146aa933e8f4f9de3befede54d65c21fd6d /solenv/gbuild/Executable.mk | |
| parent | d33b6ccda7e52e7111c0299db9a6e60400abb13b (diff) | |
gbuild: avoid packages when copying files into instdir
There should be only two ways how to add file into instdir:
- gb_Helper_install used in gbuild
- gb_Package_set_outdir used also elsewhere,
preferably with scp2 containing its .filelist.
Change-Id: I75ec0ba63f32acf4b56b17dc972f4488edf6a777
Diffstat (limited to 'solenv/gbuild/Executable.mk')
| -rw-r--r-- | solenv/gbuild/Executable.mk | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/solenv/gbuild/Executable.mk b/solenv/gbuild/Executable.mk index e083c0dccbc9..0450c6f89c63 100644 --- a/solenv/gbuild/Executable.mk +++ b/solenv/gbuild/Executable.mk @@ -23,8 +23,8 @@ # gb_Executable_Executable_platform # NOTE: SDKBIN executables are already packaged in module odk -gb_Executable_LAYER_DIRS = \ - OOO:$(gb_Package_PROGRAMDIRNAME) \ +gb_Executable_LAYER_DIRS := \ + OOO:$(gb_PROGRAMDIRNAME) \ UREBIN:ure/bin $(dir $(call gb_Executable_get_runtime_target,%)).dir : @@ -45,8 +45,7 @@ $(call gb_Executable_get_clean_target,%) : gb_Executable__get_dir_for_layer = $(patsubst $(1):%,$(INSTDIR)/%,$(filter $(1):%,$(call gb_Executable_LAYER_DIRS))) gb_Executable__get_dir_for_exe = $(call gb_Executable__get_dir_for_layer,$(call gb_Executable_get_layer,$(1))) -gb_Executable__get_instdir = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1)) -gb_Executable_get_install_target = $(if $(call gb_Executable__get_dir_for_exe,$(1)),$(call gb_Executable__get_instdir,$(1))) +gb_Executable_get_install_target = $(call gb_Executable__get_dir_for_exe,$(1))/$(call gb_Executable_get_filename,$(1)) define gb_Executable_Executable $(call gb_Postprocess_register_target,AllExecutables,Executable,$(1)) @@ -67,11 +66,15 @@ $(call gb_Executable_get_target,$(1)) : $(call gb_LinkTarget_get_target,$(2)) \ $(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_get_install_target,$(1)) +$(call gb_Executable_get_clean_target,$(1)) : AUXTARGETS := $(call gb_Executable_Executable_platform,$(1),$(2)) ifneq ($(gb_RUNNABLE_INSTDIR),) -$(call gb_Helper_install,Executable,$(1),$(call gb_LinkTarget_get_target,$(2))) +$(if $(call gb_Executable__get_dir_for_exe,$(1)), \ +$(call gb_Helper_install,$(call gb_Executable_get_target,$(1)), \ + $(call gb_Executable_get_install_target,$(1)), \ + $(call gb_LinkTarget_get_target,$(2))) \ +) endif $$(eval $$(call gb_Module_register_target,$(call gb_Executable_get_target,$(1)),$(call gb_Executable_get_clean_target,$(1)))) $(call gb_Helper_make_userfriendly_targets,$(1),Executable) |