extensions/Module_extensions.mk | 7 +++---- postprocess/CustomTarget_images.mk | 6 ++++++ 2 files changed, 9 insertions(+), 4 deletions(-)
New commits: commit 44819f98aa39cbc8e5d9d07e112fa051077322eb Author: David Tardon <[email protected]> Date: Wed Jun 8 12:49:37 2016 +0200 try to debug images_tango.zip failure on arm tinderbox Change-Id: Ia30069e57e43895ced52b3922d6321e404e78449 diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 55bc715..594d960 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -58,7 +58,13 @@ $(packimages_DIR)/commandimagelist.ilst : $(packimages_DIR)/sorted.lst : \ $(SRCDIR)/postprocess/packimages/image-sort.lst \ + $(call gb_Postprocess_get_target,AllResources) \ $(call gb_Postprocess_get_target,AllUIConfigs) + $(info images_*.zip imagelist deps: $(shell ls \ + $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ + $(call gb_Helper_get_imagelists) \ + )) \ $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SRCDIR)/solenv/bin/image-sort.pl \ commit 0a5a20e929558c3717b9fe9de04c3e82d5b378e8 Author: David Tardon <[email protected]> Date: Wed Jun 8 12:19:23 2016 +0200 merge cond. blocks to one Change-Id: Iad5858955244e12a849336f84938a39b6f3219e0 diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk index f5a27bf..b322b83 100644 --- a/extensions/Module_extensions.mk +++ b/extensions/Module_extensions.mk @@ -11,10 +11,6 @@ $(eval $(call gb_Module_Module,extensions)) $(eval $(call gb_Module_add_targets,extensions,\ Library_res \ - $(if $(filter IOS ANDROID,$(OS)),, \ - Library_abp \ - Library_log \ - Library_scn) \ )) $(eval $(call gb_Module_add_l10n_targets,extensions,\ @@ -27,7 +23,10 @@ $(eval $(call gb_Module_add_l10n_targets,extensions,\ ifneq ($(filter-out IOS ANDROID,$(OS)),) $(eval $(call gb_Module_add_targets,extensions,\ + Library_abp \ Library_ldapbe2 \ + Library_log \ + Library_scn \ )) endif _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
