mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Module_tail_build to RepositoryModule

Browse Source 
Change-Id: I06783d26f10efabd1aca06a7a1e0647d8ed58b69
This commit is contained in:
Michael Stahl
2013-03-01 00:54:25 +01:00
parent 117700c213
commit 2ee838d7ad
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.build
View File

@@ -14,6 +14,6 @@ endif
gb_Side := host gb_Side := host
include $(SOLARENV)/gbuild/gbuild.mk include $(SOLARENV)/gbuild/gbuild.mk
$(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_tail_build.mk)) $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/RepositoryModule.mk))
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

16
Module_tail_build.mk → RepositoryModule.mk
View File

@@ -22,9 +22,9 @@
# instead of those above. # instead of those above.
$(eval $(call gb_Module_Module,tail_build)) $(eval $(call gb_Module_Module,libreoffice))
$(eval $(call gb_Module_add_moduledirs,tail_build,\ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \ accessibility \
$(call gb_Helper_optional,AFMS,afms) \ $(call gb_Helper_optional,AFMS,afms) \
android \ android \
@@ -235,7 +235,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
)) ))
ifeq ($(MERGELIBS),TRUE) ifeq ($(MERGELIBS),TRUE)
$(eval $(call gb_Module_add_targets,tail_build,\ $(eval $(call gb_Module_add_targets,libreoffice,\
Library_merged \ Library_merged \
)) ))
endif endif
@@ -244,20 +244,20 @@ endif
# libraries takes enormous amounts of RAM. To prevent annoying OOM situations # libraries takes enormous amounts of RAM. To prevent annoying OOM situations
# etc., try to prevent linking these in parallel by adding artificial build # etc., try to prevent linking these in parallel by adding artificial build
# order dependencies here. # order dependencies here.
define tailbuild_serialize1 define repositorymodule_serialize1
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \
:| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib))) :| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib)))
endef endef
define tailbuild_serialize define repositorymodule_serialize
$(if $(filter-out 0 1,$(words $(1))),\ $(if $(filter-out 0 1,$(words $(1))),\
$(call tailbuild_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1)))) $(call repositorymodule_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1))))
$(if $(strip $(1)),\ $(if $(strip $(1)),\
$(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1)))) $(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef endef
ifeq (all,$(filter all,$(MAKECMDGOALS))) ifeq (all,$(filter all,$(MAKECMDGOALS)))
$(eval $(call tailbuild_serialize,\ $(eval $(call repositorymodule_serialize,\
scfilt \ scfilt \
$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \ $(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
sc msword swui sw sd \ sc msword swui sw sd \

2
solenv/gbuild/Module.mk
View File

@@ -154,7 +154,7 @@ gb_Module__debug_enabled = \
$(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR))) $(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR)))
define gb_Module_Module define gb_Module_Module
$(if $(filter-out tail_build instsetoo_native android ios,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1))) $(if $(filter-out libreoffice instsetoo_native android ios,$(1)),$(call gb_Postprocess_get_target,AllModulesButInstsetNative) : $(call gb_Module_get_target,$(1)))
gb_Module_ALLMODULES += $(1) gb_Module_ALLMODULES += $(1)
gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST)))) gb_Module_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK) gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK)