summaryrefslogtreecommitdiff
path: root/solenv
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2013-05-15 16:12:08 +0200
committerDavid Tardon <dtardon@redhat.com>2013-05-15 17:08:29 +0200
commit7fd93c32d7c0606594a35d7301e14711d4f517c0 (patch)
tree7f0f8b7d6463301b942d9966a43d604f000b43c6 /solenv
parent91b27bc3d86925e1bb52bd3ab8e2f6f87ededd3f (diff)
gbuild: silence building of galleries
Change-Id: I17e6a3923f3ee6cec22760f8c9f9410bbe742a7f
Diffstat (limited to 'solenv')
-rw-r--r--solenv/gbuild/Gallery.mk23
1 files changed, 14 insertions, 9 deletions
diff --git a/solenv/gbuild/Gallery.mk b/solenv/gbuild/Gallery.mk
index ae625329cf44..c9fdc3d02e72 100644
--- a/solenv/gbuild/Gallery.mk
+++ b/solenv/gbuild/Gallery.mk
@@ -58,15 +58,19 @@ define gb_Gallery__command
$(call gb_Output_announce,$(2),$(true),GAL,1)
$(call gb_Helper_abbreviate_dirs,\
rm -f $(call gb_Gallery_get_workdir,$(2))/* && \
- SAL_USE_VCLPLUGIN=svp \
- $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
- $(call gb_Gallery__make_env_args) \
- --build-tree \
- --destdir $(GALLERY_BASEDIR) \
- --name "$(GALLERY_NAME)" \
- --path $(call gb_Gallery_get_workdir,$(2))) \
- $(GALLERY_FILES) && \
- touch $@
+ $(call gb_Helper_print_on_error,\
+ SAL_USE_VCLPLUGIN=svp \
+ $(call gb_Executable_get_command,$(gb_GENGAL),$(ICECREAM_RUN)) \
+ $(call gb_Gallery__make_env_args) \
+ --build-tree \
+ --destdir $(GALLERY_BASEDIR) \
+ --name "$(GALLERY_NAME)" \
+ --path $(call gb_Gallery_get_workdir,$(2)) \
+ $(GALLERY_FILES),\
+ $@.log \
+ ) && \
+ touch $@ \
+)
endef
gb_Gallery__get_final_target = $(WORKDIR)/Gallery/$(1).final
@@ -92,6 +96,7 @@ $(call gb_Gallery_get_clean_target,%) :
rm -rf \
$(call gb_Gallery__get_final_target,$*) \
$(call gb_Gallery_get_target,$*) \
+ $(call gb_Gallery_get_target,$*).log \
$(call gb_Gallery_get_workdir,$*) \
)