diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 14:43:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-04-27 22:03:20 +0200 |
| commit | bfc54ba3d2ac7f7ff40f8b3e95a6bd9b74bcd0c5 (patch) | |
| tree | 77c53f9a88205c47af444b018f4682e539c2c09d /solenv | |
| parent | 11aef9734973dfcacc124205c51e14923c5579fb (diff) | |
cut top layer of detecting used bitmap resources in .src/.res files
Change-Id: I476ff9f55c264983419d5410035c1dfe6e07d5a3
Reviewed-on: https://gerrit.libreoffice.org/37035
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/AllLangResTarget.mk | 13 | ||||
| -rw-r--r-- | solenv/gbuild/Helper.mk | 1 | ||||
| -rw-r--r-- | solenv/gbuild/TargetLocations.mk | 1 |
3 files changed, 2 insertions, 13 deletions
diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index d31b10b23b3a..9da53605297e 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -244,15 +244,13 @@ $(call gb_ResTarget_get_clean_target,%) : $(call gb_Helper_abbreviate_dirs,\ rm -f \ $(call gb_ResTarget_get_target,$*) \ - $(call gb_ResTarget_get_install_target,$*) \ - $(call gb_ResTarget_get_imagelist_target,$*)) + $(call gb_ResTarget_get_install_target,$*) $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ $(gb_ResTarget_RSCDEPS) $(call gb_Output_announce,$*,$(true),RES,2) $(call gb_Helper_abbreviate_dirs,\ - mkdir -p $(dir $@) \ - $(dir $(call gb_ResTarget_get_imagelist_target,$*)) && \ + mkdir -p $(dir $@) && \ RESPONSEFILE=`$(gb_MKTEMP)` && \ echo "-r -p \ -lg$(LANGUAGE) \ @@ -265,7 +263,6 @@ $(call gb_ResTarget_get_target,%) : $(gb_Helper_MISCDUMMY) \ -lip=$(gb_ResTarget_DEFIMAGESLOCATION)res \ -subMODULE=$(gb_ResTarget_DEFIMAGESLOCATION) \ -subGLOBALRES=$(gb_ResTarget_DEFIMAGESLOCATION)res \ - -oil=$(dir $(call gb_ResTarget_get_imagelist_target,$*)) \ $(filter-out $(gb_Helper_MISCDUMMY) $(gb_ResTarget_RSCDEPS),$^)" \ > $${RESPONSEFILE} && \ $(gb_ResTarget_RSCCOMMAND) @$${RESPONSEFILE} && \ @@ -277,7 +274,6 @@ $(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_clean_target,$(2)) : $(call gb_ResTarget_get_clean_target,$(1)) -$(call gb_ResTarget_get_imagelist_target,$(1)) : $(call gb_ResTarget_get_target,$(1)) endef @@ -365,9 +361,4 @@ $(foreach lang,$(gb_AllLangResTarget_LANGS),\ endef -define gb_AllLangResTarget_get_imagelists -$(foreach lang,$(gb_AllLangResTarget_LANGS),\ - $(call gb_ResTarget_get_imagelist_target,$(1)$(lang))) -endef - # vim: set noet sw=4: diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk index 0693f139f365..0d45f071826e 100644 --- a/solenv/gbuild/Helper.mk +++ b/solenv/gbuild/Helper.mk @@ -270,7 +270,6 @@ gb_UIConfig_REGISTERED += $(1) endef define gb_Helper_get_imagelists -$(foreach res,$(gb_AllLangResTarget_REGISTERED),$(call gb_AllLangResTarget_get_imagelists,$(res))) \ $(foreach ui,$(gb_UIConfig_REGISTERED),$(call gb_UIConfig_get_imagelist_target,$(ui))) endef diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 394b44eae7d4..8ec6c4610ca3 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -144,7 +144,6 @@ gb_Pyuno_get_final_target = $(WORKDIR)/Pyuno/$(1).final gb_Pyuno_get_target = $(WORKDIR)/Pyuno/$(1).done gb_Rdb_get_target = $(WORKDIR)/Rdb/$(1).rdb gb_Rdb_get_target_for_build = $(WORKDIR_FOR_BUILD)/Rdb/$(1).rdb -gb_ResTarget_get_imagelist_target = $(WORKDIR)/ResTarget/$(1).ilst gb_ResTarget_get_target = $(WORKDIR)/ResTarget/$(1).res gb_ScpMergeTarget_get_target = $(WORKDIR)/ScpMergeTarget/$(1).ulf gb_ScpPreprocessTarget_get_target = $(WORKDIR)/ScpPreprocessTarget/$(1).pre |