Michael Weghorn
9283da8585
Now that the accessibility module no longer depends on toolkit and svtools and there's therefore no more cyclic dependency, merge it into the vcl library, where the vcl widgets are located, for which the classes in the accessibility module (primarily) provide the a11y classes. Initially, take over the existing UNO service "com.sun.star.accessibility.comp.GetStandardAccessibleFactoryService" to vcl as is. It used to be necessary to break the cyclic dependency between the vcl, svtools, toolkit and accessibility module. (vcl is the lowest and accessibility used to be furthest up in the dependency chain; yet vcl needed it to create the objects providing the XAccessible/XAccessibleContext for its widgets.) Further simplification can happen in upcoming commits. Change-Id: Ib46c87446dc9121d3b8e735e0e5a40594da73cc5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178647 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
242 lines
5.4 KiB
Makefile
242 lines
5.4 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
#
|
|
# This file is part of the LibreOffice project.
|
|
#
|
|
# This Source Code Form is subject to the terms of the Mozilla Public
|
|
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
#
|
|
|
|
|
|
$(eval $(call gb_Module_Module,libreoffice))
|
|
|
|
# This makefile needs to be read first because some variables like T_LIBS
|
|
# for libmerged are cleared there and then later we append stuff to it
|
|
# through e.g. gb_Library_use_external for various libraries in libmerged.
|
|
ifneq ($(MERGELIBS),)
|
|
$(eval $(call gb_Module_add_targets,libreoffice,\
|
|
Library_merged \
|
|
))
|
|
endif
|
|
|
|
# WASM_CHART change
|
|
ifneq ($(ENABLE_WASM_STRIP_CHART),TRUE)
|
|
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
|
chart2 \
|
|
))
|
|
endif
|
|
|
|
# WASM_CANVAS change
|
|
ifneq ($(ENABLE_WASM_STRIP_CANVAS),TRUE)
|
|
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
|
canvas \
|
|
cppcanvas \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(ENABLE_WASM_STRIP_DBACCESS),TRUE)
|
|
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
|
dbaccess \
|
|
))
|
|
endif
|
|
|
|
ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
|
|
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
|
winaccessibility \
|
|
))
|
|
endif
|
|
|
|
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
|
|
android \
|
|
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
|
animations \
|
|
) \
|
|
apple_remote \
|
|
avmedia \
|
|
$(if $(ENABLE_WASM_STRIP_CALC),, \
|
|
basctl \
|
|
) \
|
|
basegfx \
|
|
basic \
|
|
bean \
|
|
binaryurp \
|
|
bridges \
|
|
cli_ure \
|
|
codemaker \
|
|
comphelper \
|
|
configmgr \
|
|
connectivity \
|
|
cppu \
|
|
cppuhelper \
|
|
cpputools \
|
|
cui \
|
|
desktop \
|
|
$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
|
|
docmodel\
|
|
drawinglayer \
|
|
editeng \
|
|
embeddedobj \
|
|
embedserv \
|
|
eventattacher \
|
|
extensions \
|
|
external \
|
|
extras \
|
|
filter \
|
|
$(call gb_Helper_optional,DBCONNECTIVITY,forms) \
|
|
formula \
|
|
$(call gb_Helper_optional,DESKTOP,fpicker) \
|
|
framework \
|
|
$(call gb_Helper_optionals_or,HELPTOOLS XMLHELP,helpcompiler) \
|
|
$(call gb_Helper_optional,HELP,helpcontent2) \
|
|
hwpfilter \
|
|
i18nlangtag \
|
|
i18npool \
|
|
i18nutil \
|
|
idl \
|
|
instsetoo_native \
|
|
io \
|
|
javaunohelper \
|
|
jurt \
|
|
jvmaccess \
|
|
jvmfwk \
|
|
$(call gb_Helper_optional,LIBRELOGO,librelogo) \
|
|
libreofficekit \
|
|
lingucomponent \
|
|
linguistic \
|
|
lotuswordpro \
|
|
$(call gb_Helper_optional,DESKTOP,l10ntools) \
|
|
net_ure \
|
|
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
|
|
o3tl \
|
|
$(call gb_Helper_optional,ODK,odk) \
|
|
offapi \
|
|
officecfg \
|
|
oovbaapi \
|
|
oox \
|
|
$(call gb_Helper_optional,OPENCL,opencl) \
|
|
package \
|
|
pch \
|
|
postprocess \
|
|
$(call gb_Helper_optional,PYUNO,pyuno) \
|
|
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
|
|
readlicense_oo \
|
|
registry \
|
|
remotebridges \
|
|
reportbuilder \
|
|
$(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \
|
|
ridljar \
|
|
sal \
|
|
salhelper \
|
|
sax \
|
|
$(if $(ENABLE_WASM_STRIP_CALC),, \
|
|
sc \
|
|
scaddins \
|
|
sccomp \
|
|
) \
|
|
$(call gb_Helper_optional,DESKTOP,scp2) \
|
|
scripting \
|
|
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
|
sd \
|
|
sdext \
|
|
) \
|
|
$(call gb_Helper_optional,DESKTOP,setup_native) \
|
|
sfx2 \
|
|
shell \
|
|
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
|
slideshow \
|
|
) \
|
|
smoketest \
|
|
solenv \
|
|
soltools \
|
|
sot \
|
|
$(if $(ENABLE_WASM_STRIP_BASIC_DRAW_MATH_IMPRESS),, \
|
|
starmath \
|
|
) \
|
|
$(if $(ENABLE_CUSTOMTARGET_COMPONENTS),static) \
|
|
stoc \
|
|
store \
|
|
svl \
|
|
svtools \
|
|
svgio \
|
|
emfio \
|
|
svx \
|
|
$(if $(ENABLE_WASM_STRIP_WRITER),, \
|
|
sw \
|
|
swext \
|
|
) \
|
|
sysui \
|
|
test \
|
|
testtools \
|
|
toolkit \
|
|
tools \
|
|
ucb \
|
|
ucbhelper \
|
|
udkapi \
|
|
$(call gb_Helper_optional,PYUNO,uitest) \
|
|
UnoControls \
|
|
unodevtools \
|
|
unoil \
|
|
unoidl \
|
|
unotest \
|
|
unotools \
|
|
unoxml \
|
|
ure \
|
|
uui \
|
|
vbahelper \
|
|
vcl \
|
|
wizards \
|
|
writerperfect \
|
|
$(call gb_Helper_optional,XMLHELP,xmlhelp) \
|
|
xmloff \
|
|
xmlreader \
|
|
xmlscript \
|
|
xmlsecurity \
|
|
))
|
|
|
|
ifeq (,$(DISABLE_DYNLOADING))
|
|
# Especially when building everything with symbols, the linking of the largest
|
|
# 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.
|
|
# Do this only if a linker is not explicitly set, as this should only apply
|
|
# to the BFD linker and any decently modern linker presumably performs better.
|
|
ifeq (,$(USE_LD))
|
|
define repositorymodule_serialize1
|
|
$(call gb_Library_get_linktarget_target,$(1)) :| $(foreach lib,$(2),$(call gb_Library_get_target,$(lib)))
|
|
endef
|
|
else
|
|
define repositorymodule_serialize1
|
|
endef
|
|
endif
|
|
|
|
define repositorymodule_serialize
|
|
$(if $(filter-out 0 1,$(words $(1))),\
|
|
$(call repositorymodule_serialize1,$(firstword $(1)),$(wordlist 2,$(words $(1)),$(1))))
|
|
$(if $(strip $(1)),\
|
|
$(call repositorymodule_serialize,$(wordlist 2,$(words $(1)),$(1))))
|
|
endef
|
|
|
|
# DO NOT SORT ALPHABETICALLY: the libraries must be listed in dependency order,
|
|
# otherwise cyclic dependencies ruin everything.
|
|
# do not serialize on a partial build as that may fail due to missing deps.
|
|
# the default goal is build (see Module.mk)
|
|
ifeq (,$(filter-out build check unitcheck slowcheck screenshot subsequentcheck uicheck coverage,$(MAKECMDGOALS)))
|
|
$(eval $(call repositorymodule_serialize,\
|
|
scfilt \
|
|
$(call gb_Helper_optional,SCRIPTING,vbaobj) \
|
|
sc msword \
|
|
$(call gb_Helper_optional,DESKTOP,swui) \
|
|
sw \
|
|
$(if $(MERGELIBS_MORE),, \
|
|
sd \
|
|
$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
|
|
cui) \
|
|
$(if $(MERGELIBS), merged, \
|
|
chartcontroller chartcore oox svx svxcore xo sfx fwk svt vcl) \
|
|
))
|
|
endif
|
|
endif # !$(DISABLE_DYNLOADING)
|
|
|
|
# vim: set noet sw=4 ts=4:
|