[Libreoffice-commits] core.git: RepositoryModule_host.mk

Tor Lillqvist tml at collabora.com
Wed Feb 19 15:09:11 CET 2014


 RepositoryModule_host.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7f564cc75a412eede121bbc9595202255474917b
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Feb 19 16:08:26 2014 +0200

    Consistently use gb_Helper_optional
    
    Change-Id: I73108da58cfb1243b699678661a628643fa170a2

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 5ade85a..29670f7 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -184,11 +184,11 @@ endef
 ifeq (,$(filter-out all,$(MAKECMDGOALS)))
 $(eval $(call repositorymodule_serialize,\
 	scfilt scopencl \
-	$(if $(filter SCRIPTING,$(BUILD_TYPE)),vbaobj) \
+	$(call gb_Helper_optional,SCRIPTING,vbaobj) \
 	sc msword \
 	$(call gb_Helper_optional,DESKTOP,swui) \
 	sw sd \
-	$(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),dbu) \
+	$(call gb_Helper_optional,DBCONNECTIVITY,dbu) \
 	writerfilter cui chartcontroller chartcore oox svx \
 	$(if $(MERGELIBS),merged,svxcore) \
 	xo sfx fwk svt vcl \


More information about the Libreoffice-commits mailing list