summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-03-01 00:54:25 +0100
committerMichael Stahl <mstahl@redhat.com>2013-03-01 11:57:36 +0100
commit2ee838d7ad7091fb3e24f362d791b7b59ca983f7 (patch)
tree129daca42f9351b3eb7a900113cceee8fc117cdd
parent117700c213b3a612b2c7498ebeb014c3e998c4ac (diff)
rename Module_tail_build to RepositoryModule
Change-Id: I06783d26f10efabd1aca06a7a1e0647d8ed58b69
-rw-r--r--Makefile.build2
-rw-r--r--RepositoryModule.mk (renamed from Module_tail_build.mk)16
-rw-r--r--solenv/gbuild/Module.mk2
3 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.build b/Makefile.build
index a13aa834028b..322a7d74141c 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -14,6 +14,6 @@ endif
gb_Side := host
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:
diff --git a/Module_tail_build.mk b/RepositoryModule.mk
index 538c5de362b3..8050e46caebd 100644
--- a/Module_tail_build.mk
+++ b/RepositoryModule.mk
@@ -22,9 +22,9 @@
# 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 \
$(call gb_Helper_optional,AFMS,afms) \
android \
@@ -235,7 +235,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
))
ifeq ($(MERGELIBS),TRUE)
-$(eval $(call gb_Module_add_targets,tail_build,\
+$(eval $(call gb_Module_add_targets,libreoffice,\
Library_merged \
))
endif
@@ -244,20 +244,20 @@ endif
# libraries takes enormous amounts of RAM. To prevent annoying OOM situations
# etc., try to prevent linking these in parallel by adding artificial build
# order dependencies here.
-define tailbuild_serialize1
+define repositorymodule_serialize1
$(call gb_LinkTarget_get_target,$(call gb_Library_get_linktargetname,$(1))) \
:| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib)))
endef
-define tailbuild_serialize
+define repositorymodule_serialize
$(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)),\
-$(call tailbuild_serialize,$(wordlist 2,$(words $(1)),$(1))))
+$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
endef
ifeq (all,$(filter all,$(MAKECMDGOALS)))
-$(eval $(call tailbuild_serialize,\
+$(eval $(call repositorymodule_serialize,\
scfilt \
$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
sc msword swui sw sd \
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index ade89fc9a0ea..9f545a49537c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -154,7 +154,7 @@ gb_Module__debug_enabled = \
$(filter all $(1)/,$(ENABLE_DEBUGINFO_FOR)))
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_MODULELOCATIONS += $(1):$(dir $(realpath $(lastword $(MAKEFILE_LIST))))
gb_Module_TARGETSTACK := $(call gb_Module_get_target,$(1)) $(gb_Module_TARGETSTACK)