diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2013-08-30 12:47:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-09-04 16:23:17 +0200 |
| commit | a97e46f0024e99312dd16d14b0501404babcdd8d (patch) | |
| tree | a6283ae1e17f8f86bbc8a7668c42f59ae30cb50c /solenv | |
| parent | 97515d3aa26518d67a90b68a9e767cd7972ff472 (diff) | |
dont duplicate res-files in solver/ anymore, if using gb_RUNNABLE_INSTDIR
Change-Id: Ibdf452253e5d4a5882594277bdf86eb96e68b1e3
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 55a8d578acdf..c127dfbf7550 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -367,7 +367,13 @@ gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Output_announce,$*,$(false),RES,2) $(call gb_Helper_abbreviate_dirs,\ - rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*) $(call gb_ResTarget_get_unittest_target,$*)) + rm -f \ + $(call gb_ResTarget_get_target,$*) \ + $(call gb_ResTarget_get_imagelist_target,$*) \ + $(if $(gb_RUNNABLE_INSTDIR),, \ + $(call gb_ResTarget_get_outdir_target,$*) \ + ) \ + $(call gb_ResTarget_get_unittest_target,$*)) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(gb_ResTarget_RSCDEPS) @@ -399,18 +405,21 @@ define gb_ResTarget_ResTarget $(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2) $(call gb_ResTarget_get_target,$(1)) : LANGUAGE = $(3) $(call gb_ResTarget_get_target,$(1)) : RESLOCATION = $(2) -$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) $(call gb_ResTarget_get_unittest_target,$(1)) +$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_unittest_target,$(1)) $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1)) $(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) -$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir -$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) - $(call gb_ResTarget_get_unittest_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) $(call gb_ResTarget_get_unittest_target,$(1)) :| $(dir $(call gb_ResTarget_get_unittest_target,$(1))).dir $(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_unittest_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) +ifeq ($(gb_RUNNABLE_INSTDIR),) +$(call gb_AllLangResTarget_get_target,$(2)) : $(call gb_ResTarget_get_outdir_target,$(1)) +$(call gb_ResTarget_get_outdir_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) +$(call gb_ResTarget_get_outdir_target,$(1)) :| $(dir $(call gb_ResTarget_get_outdir_target,$(1))).dir +$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1)) +endif + endef define gb_ResTarget_add_file |