summaryrefslogtreecommitdiff
path: root/postprocess
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-04-29 18:38:12 +0200
committerStephan Bergmann <sbergman@redhat.com>2013-04-29 18:38:20 +0200
commit8b324e21f2ae4345f41b32e6c4b9c8a658dd5492 (patch)
tree39a364bc4f0f9fa223c5e501cbcde0f6ad57547d /postprocess
parentd7ebca515a63b34343a044443fadf9064c8d9195 (diff)
There is no images*_brand.zip files
Change-Id: I6ddeff7ae72693fd0951d71bd7b5444938bc7286
Diffstat (limited to 'postprocess')
-rw-r--r--postprocess/CustomTarget_images.mk6
-rw-r--r--postprocess/Package_images.mk2
-rw-r--r--postprocess/Package_images_install.mk1
3 files changed, 0 insertions, 9 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index e7d08c72efae..6c59c1f0c863 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -35,7 +35,6 @@ helpimages_DIR := $(call gb_CustomTarget_get_workdir,helpcontent2/source/auxilia
packimages_CUSTOM_FALLBACKS := -c $(SRCDIR)/icon-themes/tango -c $(SRCDIR)/icon-themes/industrial
$(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
- images_brand.zip \
$(if $(filter default,$(WITH_THEMES)),images.zip) \
$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
commandimagelist.ilst \
@@ -68,11 +67,6 @@ $(packimages_DIR)/%.zip : \
-s $< -o $@ \
$(if $(findstring s,$(MAKEFLAGS)),> /dev/null))
-# make sure to have one to keep packing happy
-$(packimages_DIR)/images_brand.zip :
- $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TCH,2)
- touch $@
-
# commandimagelist.ilst and sorted.lst are phony to rebuild everything each time
.PHONY : $(packimages_DIR)/commandimagelist.ilst $(packimages_DIR)/sorted.lst
diff --git a/postprocess/Package_images.mk b/postprocess/Package_images.mk
index 6d6059036f72..749da1e066ec 100644
--- a/postprocess/Package_images.mk
+++ b/postprocess/Package_images.mk
@@ -27,8 +27,6 @@
$(eval $(call gb_Package_Package,postprocess_images,$(call gb_CustomTarget_get_workdir,postprocess/images)))
-$(eval $(call gb_Package_add_file,postprocess_images,bin/images_brand.zip,images_brand.zip))
-
$(if $(filter default,$(WITH_THEMES)),\
$(eval $(call gb_Package_add_file,postprocess_images,bin/images.zip,images.zip)))
diff --git a/postprocess/Package_images_install.mk b/postprocess/Package_images_install.mk
index 1759d6cd9d2a..af0f269d8d87 100644
--- a/postprocess/Package_images_install.mk
+++ b/postprocess/Package_images_install.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Package_Package,postprocess_images_install,$(call gb_CustomTarg
$(eval $(call gb_Package_set_outdir,postprocess_images_install,$(INSTDIR)))
$(eval $(call gb_Package_add_files,postprocess_images_install,share/config,\
- images_brand.zip \
$(if $(filter default,$(WITH_THEMES)),images.zip) \
$(foreach theme,$(filter-out default,$(WITH_THEMES)),images_$(theme).zip) \
))