summaryrefslogtreecommitdiff
path: root/Module_tail_build.mk
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@gmail.com>2012-12-14 21:24:33 +0100
committerMatúš Kukan <matus.kukan@gmail.com>2012-12-15 12:56:37 +0100
commit798d758577f3f5445bcc5ff71eeb99976228ca99 (patch)
tree8c053cfac8797e3b54cb45e39cabafb0fb9484d7 /Module_tail_build.mk
parent6af14cc8ecd69bbbff94fa47c14f53c94e8751e6 (diff)
use more gb_Helper_optional for consistency
Change-Id: I8f68addd1e94d658ed43b8c1a59bfd51ed9b71b8
Diffstat (limited to 'Module_tail_build.mk')
-rw-r--r--Module_tail_build.mk22
1 files changed, 11 insertions, 11 deletions
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index ed471b8318f4..34569d10637c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -97,17 +97,17 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
$(call gb_Helper_optional,LCMS2,lcms2) \
- libcdr \
- libcmis \
+ $(call gb_Helper_optional,CDR,libcdr) \
+ $(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
- libmspub \
- liborcus \
+ $(call gb_Helper_optional,MSPUB,libmspub) \
+ $(call gb_Helper_optional,ORCUS,liborcus) \
librelogo \
- libvisio \
- libwpd \
- libwpg \
- libwps \
+ $(call gb_Helper_optional,VISIO,libvisio) \
+ $(call gb_Helper_optional,WPD,libwpd) \
+ $(call gb_Helper_optional,WPG,libwpg) \
+ $(call gb_Helper_optional,WPS,libwps) \
libxmlsec \
lingucomponent \
linguistic \
@@ -115,7 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
MathMLDTD \
- mdds \
+ $(call gb_Helper_optional,MDDS,mdds) \
Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MYTHES,mythes) \
@@ -191,7 +191,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
uui \
vbahelper \
vcl \
- vigra \
+ $(call gb_Helper_optional,VIGRA,vigra) \
wizards \
writerfilter \
writerperfect \
@@ -202,7 +202,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
xmlreader \
xmlscript \
xmlsecurity \
- xsltml \
+ $(call gb_Helper_optional,XSLTML,xsltml) \
))
ifeq ($(MERGELIBS),TRUE)