Kaydet (Commit) 798d7585 authored tarafından Matúš Kukan's avatar Matúš Kukan

use more gb_Helper_optional for consistency

Change-Id: I8f68addd1e94d658ed43b8c1a59bfd51ed9b71b8
üst 6af14cc8
...@@ -97,17 +97,17 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ ...@@ -97,17 +97,17 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
jvmfwk \ jvmfwk \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
$(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LCMS2,lcms2) \
libcdr \ $(call gb_Helper_optional,CDR,libcdr) \
libcmis \ $(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
libmspub \ $(call gb_Helper_optional,MSPUB,libmspub) \
liborcus \ $(call gb_Helper_optional,ORCUS,liborcus) \
librelogo \ librelogo \
libvisio \ $(call gb_Helper_optional,VISIO,libvisio) \
libwpd \ $(call gb_Helper_optional,WPD,libwpd) \
libwpg \ $(call gb_Helper_optional,WPG,libwpg) \
libwps \ $(call gb_Helper_optional,WPS,libwps) \
libxmlsec \ libxmlsec \
lingucomponent \ lingucomponent \
linguistic \ linguistic \
...@@ -115,7 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ ...@@ -115,7 +115,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
$(call gb_Helper_optional,LPSOLVE,lpsolve) \ $(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,DESKTOP,l10ntools) \ $(call gb_Helper_optional,DESKTOP,l10ntools) \
MathMLDTD \ MathMLDTD \
mdds \ $(call gb_Helper_optional,MDDS,mdds) \
Mesa \ Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MYTHES,mythes) \ $(call gb_Helper_optional,MYTHES,mythes) \
...@@ -191,7 +191,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ ...@@ -191,7 +191,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
uui \ uui \
vbahelper \ vbahelper \
vcl \ vcl \
vigra \ $(call gb_Helper_optional,VIGRA,vigra) \
wizards \ wizards \
writerfilter \ writerfilter \
writerperfect \ writerperfect \
...@@ -202,7 +202,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\ ...@@ -202,7 +202,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_build,\
xmlreader \ xmlreader \
xmlscript \ xmlscript \
xmlsecurity \ xmlsecurity \
xsltml \ $(call gb_Helper_optional,XSLTML,xsltml) \
)) ))
ifeq ($(MERGELIBS),TRUE) ifeq ($(MERGELIBS),TRUE)
......
...@@ -105,25 +105,25 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ ...@@ -105,25 +105,25 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
$(call gb_Helper_optional,DESKTOP,l10ntools) \ $(call gb_Helper_optional,DESKTOP,l10ntools) \
$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
$(call gb_Helper_optional,LCMS2,lcms2) \ $(call gb_Helper_optional,LCMS2,lcms2) \
libcdr \ $(call gb_Helper_optional,CDR,libcdr) \
libcmis \ $(call gb_Helper_optional,CMIS,libcmis) \
$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
libmspub \ $(call gb_Helper_optional,MSPUB,libmspub) \
liborcus \ $(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,LIBPNG,libpng) \
librelogo \ librelogo \
libvisio \ $(call gb_Helper_optional,VISIO,libvisio) \
libwpd \ $(call gb_Helper_optional,WPD,libwpd) \
libwpg \ $(call gb_Helper_optional,WPG,libwpg) \
libwps \ $(call gb_Helper_optional,WPS,libwps) \
libxmlsec \ libxmlsec \
lingucomponent \ lingucomponent \
linguistic \ linguistic \
lotuswordpro \ lotuswordpro \
$(call gb_Helper_optional,LPSOLVE,lpsolve) \ $(call gb_Helper_optional,LPSOLVE,lpsolve) \
MathMLDTD \ MathMLDTD \
mdds \ $(call gb_Helper_optional,MDDS,mdds) \
Mesa \ Mesa \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \ $(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MYTHES,mythes) \ $(call gb_Helper_optional,MYTHES,mythes) \
...@@ -203,7 +203,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ ...@@ -203,7 +203,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
uui \ uui \
vbahelper \ vbahelper \
vcl \ vcl \
vigra \ $(call gb_Helper_optional,VIGRA,vigra) \
wizards \ wizards \
writerfilter \ writerfilter \
writerperfect \ writerperfect \
...@@ -214,7 +214,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\ ...@@ -214,7 +214,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
xmlreader \ xmlreader \
xmlscript \ xmlscript \
xmlsecurity \ xmlsecurity \
xsltml \ $(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \ $(call gb_Helper_optional,ZLIB,zlib) \
)) ))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment