diff options
author | Peter Foley <pefoley2@verizon.net> | 2012-12-25 17:39:43 -0500 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-12-27 15:53:39 +0000 |
commit | b92a0d9208e1b1a33818a3c451e9952963295f6c (patch) | |
tree | f468dbf463d43f6f43b56e0a0eed7bec84f00a5b /l10ntools | |
parent | e7f7053b227cf109c3cf733d0c698e51aed159a3 (diff) |
convert icu to gbuild and add to tail_build
Change-Id: Id7d8bc05b1393cc2bae4a531c8a47f62df24b1d6
Reviewed-on: https://gerrit.libreoffice.org/1488
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'l10ntools')
-rw-r--r-- | l10ntools/Executable_helpex.mk | 1 | ||||
-rw-r--r-- | l10ntools/Executable_stringex.mk | 1 | ||||
-rw-r--r-- | l10ntools/Executable_transex3.mk | 1 | ||||
-rw-r--r-- | l10ntools/Executable_treex.mk | 3 | ||||
-rw-r--r-- | l10ntools/Executable_uiex.mk | 1 | ||||
-rw-r--r-- | l10ntools/Executable_xrmex.mk | 1 | ||||
-rw-r--r-- | l10ntools/StaticLibrary_transex.mk | 5 |
7 files changed, 11 insertions, 2 deletions
diff --git a/l10ntools/Executable_helpex.mk b/l10ntools/Executable_helpex.mk index 48261762135d..0652b642943e 100644 --- a/l10ntools/Executable_helpex.mk +++ b/l10ntools/Executable_helpex.mk @@ -38,6 +38,7 @@ $(eval $(call gb_Executable_use_libraries,helpex,\ $(eval $(call gb_Executable_use_externals,helpex,\ expat_utf8 \ boost_headers \ + icu_headers \ )) $(eval $(call gb_Executable_use_static_libraries,helpex,\ diff --git a/l10ntools/Executable_stringex.mk b/l10ntools/Executable_stringex.mk index b05341290995..f20a9f8fddad 100644 --- a/l10ntools/Executable_stringex.mk +++ b/l10ntools/Executable_stringex.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Executable_use_externals,stringex,\ libxml2 \ icuuc \ icui18n \ + icu_headers \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_transex3.mk b/l10ntools/Executable_transex3.mk index baba40e777a3..132e8a1b750d 100644 --- a/l10ntools/Executable_transex3.mk +++ b/l10ntools/Executable_transex3.mk @@ -52,6 +52,7 @@ $(eval $(call gb_Executable_add_exception_objects,transex3,\ $(eval $(call gb_Executable_use_externals,transex3,\ icuuc \ icui18n \ + icu_headers \ libxml2 \ )) diff --git a/l10ntools/Executable_treex.mk b/l10ntools/Executable_treex.mk index 2cdb1b2de4a2..988e78046803 100644 --- a/l10ntools/Executable_treex.mk +++ b/l10ntools/Executable_treex.mk @@ -30,8 +30,9 @@ $(eval $(call gb_Executable_add_exception_objects,treex,\ $(eval $(call gb_Executable_use_externals,treex,\ libxml2 \ - icuuc \ + icuuc \ icui18n \ + icu_headers \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_uiex.mk b/l10ntools/Executable_uiex.mk index 5a8f23c7a433..0c142c00f85d 100644 --- a/l10ntools/Executable_uiex.mk +++ b/l10ntools/Executable_uiex.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Executable_use_externals,uiex,\ boost_headers \ icuuc \ icui18n \ + icu_headers \ )) # vim: set noet sw=4 ts=4: diff --git a/l10ntools/Executable_xrmex.mk b/l10ntools/Executable_xrmex.mk index bcad1b9d3993..f11f33d46434 100644 --- a/l10ntools/Executable_xrmex.mk +++ b/l10ntools/Executable_xrmex.mk @@ -53,6 +53,7 @@ $(eval $(call gb_Executable_use_externals,xrmex,\ libxml2 \ icuuc \ icui18n \ + icu_headers \ )) # vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/l10ntools/StaticLibrary_transex.mk b/l10ntools/StaticLibrary_transex.mk index 79a7a20e3db4..e5cad80a6df7 100644 --- a/l10ntools/StaticLibrary_transex.mk +++ b/l10ntools/StaticLibrary_transex.mk @@ -37,7 +37,10 @@ $(eval $(call gb_StaticLibrary_set_include,transex,\ $$(INCLUDE) \ )) -$(eval $(call gb_StaticLibrary_use_external,transex,boost_headers)) +$(eval $(call gb_StaticLibrary_use_externals,transex,\ + boost_headers \ + icu_headers \ +)) $(eval $(call gb_StaticLibrary_add_exception_objects,transex,\ l10ntools/source/export2 \ |