diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2014-11-23 03:07:44 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2014-11-23 03:15:53 +0100 |
| commit | b6bdc6771199b7b05d4f9840b66ebce3bb61d7db (patch) | |
| tree | 89269b8c1082d9e88426fd4c175cef5c33845bd3 /postprocess | |
| parent | 78bf950a3e988f20bb5db61c966faa3b8de6d0e3 (diff) | |
icons: Package only the icons that are in the theme.
The fallback is now implemented directly in vcl, no need to waste space any
more.
Change-Id: Ia027fda5e92d2bac7369139f3277d73b0521bef2
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index cbc9cef79090..5d995b737b6b 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -13,10 +13,6 @@ $(eval $(call gb_CustomTarget_CustomTarget,postprocess/images)) packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images) helpimages_DIR := $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxiliary) -# Custom sets, at 24x24 & 16x16 fall-back to Tango preferentially -# (Tango fallbacks to Industrial for the missing icons) -packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c $(SRCDIR)/icon-themes/industrial - $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\ $(foreach theme,$(WITH_THEMES),images_$(theme).zip) \ commandimagelist.ilst \ @@ -36,11 +32,9 @@ $(packimages_DIR)/%.zip : \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SRCDIR)/solenv/bin/packimages.pl \ - -g $(SRCDIR)/icon-themes/galaxy \ - -m $(SRCDIR)/icon-themes/galaxy \ $(if $(DEFAULT_THEME),\ - -c $(packimages_DIR),\ - -c $(SRCDIR)/icon-themes/$(subst images_,,$*) $(packimages_CUSTOM_FALLBACKS) \ + -g $(packimages_DIR) -m $(packimages_DIR) -c $(packimages_DIR),\ + -g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \ ) \ $(call gb_Helper_optional,HELP,-l $(helpimages_DIR) ) \ -l $(packimages_DIR) \ |