Fix circular deps when opencl is disabled

Change-Id: Ic68f3ae19ae55d507b80f4685966357d55cb47b9
Reviewed-on: https://gerrit.libreoffice.org/11407
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
This commit is contained in:
Peter Foley 2014-09-11 18:05:01 -04:00 committed by David Tardon
parent 1e04460c9a
commit 2d85145755

View file

@ -182,7 +182,8 @@ endef
# the default goal is all (see Module.mk) # the default goal is all (see Module.mk)
ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck,$(MAKECMDGOALS))) ifeq (,$(filter-out all build check unitcheck slowcheck subsequentcheck,$(MAKECMDGOALS)))
$(eval $(call repositorymodule_serialize,\ $(eval $(call repositorymodule_serialize,\
scfilt scopencl \ scfilt \
$(if $(ENABLE_OPENCL),scopencl) \
$(call gb_Helper_optional,SCRIPTING,vbaobj) \ $(call gb_Helper_optional,SCRIPTING,vbaobj) \
sc msword \ sc msword \
$(call gb_Helper_optional,DESKTOP,swui) \ $(call gb_Helper_optional,DESKTOP,swui) \