beautify Module_tailbuild a bit

Change-Id: If54d57c962c6cb97c539e46f2ea747668706770e

Module_tail_build.mk

@@ -26,9 +26,7 @@ $(eval $(call gb_Module_Module,tail_end))
 
 $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	accessibility \
-	$(if $(filter AFMS,$(BUILD_TYPE)),\
-		afms \
-	) \
+	$(call gb_Helper_optional,AFMS,afms) \
 	animations \
 	apple_remote \
 	autodoc \
@@ -39,19 +37,13 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	basic \
 	bean \
 	binaryurp \
-	$(if $(filter BLUEZ,$(BUILD_TYPE)),\
-		bluez_bluetooth \
-	) \
+	$(call gb_Helper_optional,BLUEZ,bluez_bluetooth) \
 	bridges \
 	canvas \
 	chart2 \
 	cli_ure \
-	$(if $(filter CLUCENE,$(BUILD_TYPE)),\
-		clucene \
-	) \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),\
-		codemaker \
-	) \
+	$(call gb_Helper_optional,CLUCENE,clucene) \
+	$(call gb_Helper_optional,DESKTOP,codemaker) \
 	comphelper \
 	configmgr \
 	connectivity \
@@ -63,9 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	cui \
 	dbaccess \
 	desktop \
-	$(if $(filter DICTIONARIES,$(BUILD_TYPE)),\
-		dictionaries \
-	) \
+	$(call gb_Helper_optional,DICTIONARIES,dictionaries) \
 	dtrans \
 	drawinglayer \
 	editeng \
@@ -80,19 +70,13 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	formula \
 	fpicker \
 	framework \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
-	    helpcompiler \
-	) \
-	$(if $(filter HSQLDB,$(BUILD_TYPE)),\
-		hsqldb \
-	) \
+	$(call gb_Helper_optional,DESKTOP,helpcompiler) \
+	$(call gb_Helper_optional,HSQLDB,hsqldb) \
 	hwpfilter \
 	i18npool \
 	i18nutil \
 	idl \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),\
-		idlc \
-	) \
+	$(call gb_Helper_optional,DESKTOP,idlc) \
 	io \
 	javaunohelper \
 	jurt \
@@ -109,21 +93,13 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	lingucomponent \
 	linguistic \
 	lotuswordpro \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),\
-		l10ntools \
-	) \
+	$(call gb_Helper_optional,DESKTOP,l10ntools) \
 	MathMLDTD \
 	mdds \
 	Mesa \
-	$(if $(filter MORE_FONTS,$(BUILD_TYPE)),\
-		more_fonts \
-	) \
-	$(if $(filter NEON,$(BUILD_TYPE)),\
-		neon \
-	) \
-	$(if $(filter NLPSOLVER,$(BUILD_TYPE)),\
-		nlpsolver \
-	) \
+	$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+	$(call gb_Helper_optional,NEON,neon) \
+	$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
 	np_sdk \
 	o3tl \
 	offapi \
@@ -133,15 +109,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	package \
 	padmin \
 	psprint_config \
-    $(if $(filter PYUNO,$(BUILD_TYPE)),\
-		pyuno \
-	) \
-	$(if $(filter QADEVOOO,$(BUILD_TYPE)),\
-		qadevOOo \
-	) \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),\
-		rdbmaker \
-	) \
+	$(call gb_Helper_optional,PYUNO,pyuno) \
+	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
+	$(call gb_Helper_optional,DESKTOP,rdbmaker) \
 	readlicense_oo \
 	regexp \
 	registry \
@@ -156,9 +126,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	sc \
 	scaddins \
 	sccomp \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)),\
-		scp2 \
-	) \
+	$(call gb_Helper_optional,DESKTOP,scp2) \
 	scripting \
 	sd \
 	sdext \
@@ -180,16 +148,12 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	toolkit \
 	tools \
 	touch \
-	$(if $(filter TRANSLATIONS,$(BUILD_TYPE)),\
-		translations \
-	) \
+	$(call gb_Helper_optional,TRANSLATIONS,translations) \
 	tubes \
 	twain \
 	ucb \
 	ucbhelper \
-	$(if $(filter UCPP,$(BUILD_TYPE)),\
-		ucpp \
-	) \
+	$(call gb_Helper_optional,UCPP,ucpp) \
 	udkapi \
 	udm \
 	unixODBC \
@@ -207,13 +171,9 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
 	wizards \
 	writerfilter \
 	writerperfect \
-	$(if $(filter X11_EXTENSIONS,$(BUILD_TYPE)), \
-		x11_extensions \
-	) \
+	$(call gb_Helper_optional,EXTENSIONS,x11_extensions) \
 	xmerge \
-	$(if $(filter DESKTOP,$(BUILD_TYPE)), \
-	    xmlhelp \
-	) \
+	$(call gb_Helper_optional,DESKTOP,xmlhelp) \
 	xmloff \
 	xmlreader \
 	xmlscript \

solenv/gbuild/Helper.mk

@@ -189,4 +189,8 @@ endef
 # gb_Helper_OUTDIRLIBDIR is set by the platform to the path the dynamic linker need to use
 # for libraries from the OUTDIR
 
+define gb_Helper_optional
+$(if $(filter $(1),$(BUILD_TYPE)),$(2))
+endef
+
 # vim: set noet sw=4 ts=4: