Makefile.in | 3 --- Module_cross_toolset.mk | 1 + postprocess/CustomTarget_images.mk | 30 +++++++++++++++++++----------- 3 files changed, 20 insertions(+), 14 deletions(-)
New commits: commit 642f721e00098f0f99a1d370ae49b8600a13e86e Author: Matúš Kukan <[email protected]> Date: Tue Feb 26 17:44:00 2013 +0100 postprocess: fix creating of images*zip Prerequisites need to be in special order because we use $< in rules. Also add dependency on AllPackages which could help. Change-Id: Iec1821b333d9ce88fb811e0f262b0845f922a467 diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index ed6e7f7..965d3f6 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -34,13 +34,18 @@ packimages_DIR := $(call gb_CustomTarget_get_workdir,postprocess/images) packimages_CUSTOM_FALLBACK_1 := -c $(SRCDIR)/icon-themes/tango packimages_CUSTOM_FALLBACK_2 := -c $(SRCDIR)/icon-themes/industrial -$(call gb_CustomTarget_get_target,postprocess/images) : \ - $(packimages_DIR)/images_brand.zip \ - $(if $(filter default,$(WITH_THEMES)),$(packimages_DIR)/images.zip) \ - $(foreach theme,$(filter-out default,$(WITH_THEMES)),$(packimages_DIR)/images_$(theme).zip) +$(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 \ + sorted.lst \ +)) -$(packimages_DIR)/images.zip : $(call gb_Postprocess_get_target,AllResources) \ - $(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst +$(packimages_DIR)/images.zip : \ + $(packimages_DIR)/sorted.lst \ + $(packimages_DIR)/commandimagelist.ilst \ + $(call gb_Postprocess_get_target,AllResources) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ @@ -48,8 +53,10 @@ $(packimages_DIR)/images.zip : $(call gb_Postprocess_get_target,AllResources) \ -l $(packimages_DIR) -l $(dir $(call gb_ResTarget_get_imagelist_target)) -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -$(packimages_DIR)/images_%.zip : $(call gb_Postprocess_get_target,AllResources) \ - $(packimages_DIR)/sorted.lst $(packimages_DIR)/commandimagelist.ilst +$(packimages_DIR)/images_%.zip : \ + $(packimages_DIR)/sorted.lst \ + $(packimages_DIR)/commandimagelist.ilst \ + $(call gb_Postprocess_get_target,AllResources) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/packimages.pl -g $(SRCDIR)/icon-themes/galaxy \ @@ -59,14 +66,14 @@ $(packimages_DIR)/images_%.zip : $(call gb_Postprocess_get_target,AllResources) $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) # make sure to have one to keep packing happy -$(packimages_DIR)/images_brand.zip :| $(packimages_DIR)/.dir +$(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 -$(packimages_DIR)/commandimagelist.ilst :| $(packimages_DIR)/.dir +$(packimages_DIR)/commandimagelist.ilst : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ find $(SRCDIR)/icon-themes/galaxy/cmd -name "*.png" -o -name "*.svg" | \ @@ -76,7 +83,8 @@ $(packimages_DIR)/commandimagelist.ilst :| $(packimages_DIR)/.dir $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) $(packimages_DIR)/sorted.lst : \ - $(SRCDIR)/postprocess/packimages/image-sort.lst | $(packimages_DIR)/.dir + $(SRCDIR)/postprocess/packimages/image-sort.lst \ + $(call gb_Postprocess_get_target,AllPackages) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ $(PERL) $(SOLARENV)/bin/image-sort.pl $< $(OUTDIR)/xml $@) commit a4a7a580a74781f2e4593a8a8614db0f4e798899 Author: Matúš Kukan <[email protected]> Date: Tue Feb 26 13:18:21 2013 +0100 add solenv to Module_cross_toolset.mk too It's already in tail_build, so hopefully the dependencies are fine. Change-Id: Id2b2474c76895bd25dd34208654d924ad1c4be66 diff --git a/Makefile.in b/Makefile.in index ba2dfc0..5fe3dee 100644 --- a/Makefile.in +++ b/Makefile.in @@ -280,10 +280,7 @@ endif build-nocheck : export SKIP_TESTS := YES build-nocheck : build -# Ideally solenv would be also in Module_cross_toolset.mk -# but one would need to chase and add missing dependencies. cross-toolset: bootstrap fetch - $(GNUMAKE) gb_Side=build solenv $(GNUMAKE) -j $(PARALLELISM) $(GMAKE_OPTIONS) -f $(SRCDIR)/Makefile.cross # diff --git a/Module_cross_toolset.mk b/Module_cross_toolset.mk index e805979..bc55322 100644 --- a/Module_cross_toolset.mk +++ b/Module_cross_toolset.mk @@ -62,6 +62,7 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\ sax \ setup_native \ shell \ + solenv \ soltools \ stoc \ store \
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
