summaryrefslogtreecommitdiff
path: root/solenv/gbuild/AllLangResTarget.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-08-21 23:27:13 +0200
committerMatúš Kukan <matus.kukan@gmail.com>2012-09-19 21:06:55 +0200
commitdae269b5697287c7ffd57b1cb4c80b0560bc618e (patch)
tree8cfd80cbf82233692f6861daa94768e37d139d8f /solenv/gbuild/AllLangResTarget.mk
parent764f0e9a5552336cb7fc5fdf9d6108d9f3640df7 (diff)
do not copy .ilst files into solver
Change-Id: Ib192d827ba0bcffc6e9dbca37d9af5f2d0dd3939
Diffstat (limited to 'solenv/gbuild/AllLangResTarget.mk')
-rw-r--r--solenv/gbuild/AllLangResTarget.mk10
1 files changed, 2 insertions, 8 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk
index e7703df7cbe8..27ac952d2f7c 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -321,7 +321,7 @@ 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_outdir_imagelist_target,$*))
+ rm -f $(call gb_ResTarget_get_target,$*) $(call gb_ResTarget_get_imagelist_target,$*) $(call gb_ResTarget_get_outdir_target,$*))
$(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
$(gb_ResTarget_RSCTARGET)
@@ -350,9 +350,7 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \
rm -f $${RESPONSEFILE})
$(call gb_ResTarget_get_outdir_target,%) :
- $(call gb_Helper_abbreviate_dirs,\
- $(call gb_Deliver_deliver,$<,$@) && \
- $(call gb_Deliver_deliver,$(dir $<)/$(notdir $(ILSTTARGET)),$(ILSTTARGET)))
+ $(call gb_Deliver_deliver,$<,$@)
define gb_ResTarget_ResTarget
$(call gb_ResTarget_get_target,$(1)) : LIBRARY = $(2)
@@ -363,11 +361,7 @@ $(call gb_AllLangResTarget_get_clean_target,$(2)) : $(call gb_ResTarget_get_clea
$(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)) : ILSTTARGET = $(call gb_ResTarget_get_outdir_imagelist_target,$(1))
-$(call gb_ResTarget_get_outdir_imagelist_target,$(1)) :| \
- $(dir $(call gb_ResTarget_get_outdir_imagelist_target,$(1))).dir
$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_target,$(1)),$(call gb_ResTarget_get_target,$(1)),$(1))
-$(call gb_Deliver_add_deliverable,$(call gb_ResTarget_get_outdir_imagelist_target,$(1)),$(call gb_ResTarget_get_imagelist_target,$(1)),$(1))
endef