[Libreoffice-commits] core.git: postprocess/CustomTarget_images.mk

[Katarina Behrens]

 postprocess/CustomTarget_images.mk |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit 84418b34b1b7b0fd2871b827f7bdb518af19255f
Author: Katarina Behrens <Katarina.Behrens at cib.de>
Date:   Fri Nov 18 12:39:42 2016 +0100

    Move processing of help-specific images away from core
    
    Change-Id: I7fc3ad4509a538a4ebf31a304237f942a3671837
    Reviewed-on: https://gerrit.libreoffice.org/30959
    Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk
index 87b5faefb6ed..44899e6105a5 100644
--- a/postprocess/CustomTarget_images.mk
+++ b/postprocess/CustomTarget_images.mk
@@ -11,7 +11,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)
 
 $(eval $(call gb_CustomTarget_register_targets,postprocess/images,\
 	$(foreach theme,$(WITH_THEMES),images_$(theme).zip) \
@@ -30,8 +29,6 @@ $(packimages_DIR)/%.zip : \
 		$(packimages_DIR)/commandimagelist.ilst \
 		$(packimages_DIR)/sourceimagelist.ilst \
 		$(SRCDIR)/wizards/source/imagelists/imagelists.ilst \
-		$(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \
-		$(call gb_Helper_optional,HELP,$(helpimages_DIR)/screenshotimg.ilst) \
 		$(call gb_Helper_get_imagelists)
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2)
 	$(call gb_Helper_abbreviate_dirs, \
@@ -42,7 +39,6 @@ $(packimages_DIR)/%.zip : \
 				-g $(SRCDIR)/icon-themes/$(subst images_,,$*) -m $(SRCDIR)/icon-themes/$(subst images_,,$*) -c $(SRCDIR)/icon-themes/$(subst images_,,$*) \
 			) \
 			$(INDUSTRIAL_FALLBACK) \
-			$(call gb_Helper_optional,HELP,-e $(SRCDIR)/helpcontent2/source) \
 			-l $${ILSTFILE} \
 			-s $< -o $@ \
 			$(if $(findstring s,$(MAKEFLAGS)),> /dev/null) && \