[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 2 commits - i18npool/Executable_gencoll_rule.mk i18npool/Executable_genconv_dict.mk i18npool/Executable_gendict.mk i18npool/Executable_genindex_data.mk i18npool/Executable_saxparser.mk i18npool/inc i18npool/Library_collator_data.mk i18npool/Library_dict_ja.mk i18npool/Library_dict_zh.mk i18npool/Library_i18nisolang1.mk i18npool/Library_i18npaper.mk i18npool/Library_i18npool.mk i18npool/Library_i18nsearch.mk i18npool/Library_index_data.mk i18npool/Library_localedata_en.mk i18npool/Library_localedata_es.mk i18npool/Library_localedata_euro.mk i18npool/Library_localedata_others.mk i18npool/Library_textconv_dict.mk i18npool/Makefile i18npool/Module_i18npool.mk i18npool/Package_inc.mk i18npool/Package_version.mk i18npool/Package_xml.mk i18npool/prj i18npool/source icu/icuversion.mk lingucomponent/Library_spell.mk Module_ooo.mk postprocess/packcomponents RepositoryExternal.mk RepositoryFixes.mk Repository.mk solenv/gbuild tools/inc tools/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Feb 5 07:08:05 UTC 2019


 Module_ooo.mk                                         |    1 
 Repository.mk                                         |   16 +
 RepositoryExternal.mk                                 |   54 +++-
 RepositoryFixes.mk                                    |   28 --
 i18npool/Executable_gencoll_rule.mk                   |   54 ++++
 i18npool/Executable_genconv_dict.mk                   |   45 +++
 i18npool/Executable_gendict.mk                        |   45 +++
 i18npool/Executable_genindex_data.mk                  |   54 ++++
 i18npool/Executable_saxparser.mk                      |   73 ++++++
 i18npool/Library_collator_data.mk                     |   62 +++++
 i18npool/Library_dict_ja.mk                           |   53 ++++
 i18npool/Library_dict_zh.mk                           |   53 ++++
 i18npool/Library_i18nisolang1.mk                      |   59 +++++
 i18npool/Library_i18npaper.mk                         |   60 +++++
 i18npool/Library_i18npool.mk                          |  203 ++++++++++++++++++
 i18npool/Library_i18nsearch.mk                        |   67 +++++
 i18npool/Library_index_data.mk                        |   54 ++++
 i18npool/Library_localedata_en.mk                     |  100 ++++++++
 i18npool/Library_localedata_es.mk                     |   76 ++++++
 i18npool/Library_localedata_euro.mk                   |  130 +++++++++++
 i18npool/Library_localedata_others.mk                 |  141 ++++++++++++
 i18npool/Library_textconv_dict.mk                     |   66 +++++
 i18npool/Makefile                                     |   32 ++
 i18npool/Module_i18npool.mk                           |   81 +++++++
 i18npool/Package_inc.mk                               |   28 ++
 i18npool/Package_version.mk                           |   27 ++
 i18npool/Package_xml.mk                               |   38 +++
 i18npool/inc/pch/precompiled_i18nisolang.cxx          |   25 ++
 i18npool/inc/pch/precompiled_i18nisolang.hxx          |   28 ++
 i18npool/inc/pch/precompiled_i18npaper.cxx            |   25 ++
 i18npool/inc/pch/precompiled_i18npaper.hxx            |   28 ++
 i18npool/inc/pch/precompiled_search.cxx               |   25 ++
 i18npool/inc/pch/precompiled_search.hxx               |   28 ++
 i18npool/prj/build.lst                                |   26 --
 i18npool/prj/d.lst                                    |   52 ----
 i18npool/prj/makefile.mk                              |   44 +++
 i18npool/source/breakiterator/gendict.cxx             |   10 
 i18npool/source/breakiterator/makefile.mk             |    2 
 i18npool/source/collator/gencoll_rule.cxx             |    2 
 i18npool/source/indexentry/genindex_data.cxx          |    2 
 i18npool/source/isolang/insys.cxx                     |    2 
 i18npool/source/isolang/inunx.cxx                     |    2 
 i18npool/source/isolang/inwnt.cxx                     |    2 
 i18npool/source/isolang/isolang.cxx                   |    2 
 i18npool/source/isolang/mslangid.cxx                  |    2 
 i18npool/source/localedata/filewriter.cxx             |   16 -
 i18npool/source/registerservices/registerservices.cxx |    4 
 i18npool/source/search/levdis.cxx                     |    2 
 i18npool/source/search/textsearch.cxx                 |    6 
 i18npool/source/textconversion/genconv_dict.cxx       |   42 +--
 icu/icuversion.mk                                     |    6 
 lingucomponent/Library_spell.mk                       |    6 
 postprocess/packcomponents/makefile.mk                |    4 
 solenv/gbuild/Executable.mk                           |    1 
 solenv/gbuild/Library.mk                              |    2 
 solenv/gbuild/LinkTarget.mk                           |   53 ++++
 solenv/gbuild/StaticLibrary.mk                        |    1 
 solenv/gbuild/TargetLocations.mk                      |    2 
 solenv/gbuild/platform/freebsd.mk                     |    5 
 solenv/gbuild/platform/linux.mk                       |    5 
 solenv/gbuild/platform/macosx.mk                      |    5 
 solenv/gbuild/platform/os2.mk                         |    5 
 solenv/gbuild/platform/solaris.mk                     |    5 
 solenv/gbuild/platform/windows.mk                     |    4 
 solenv/gbuild/platform/winmingw.mk                    |    6 
 tools/inc/tools/stream.hxx                            |    2 
 tools/source/stream/strmunx.cxx                       |    2 
 67 files changed, 2018 insertions(+), 173 deletions(-)

New commits:
commit ff3d5a2c5bafdafae641c7e7287df67c182767ef
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Tue Feb 5 05:54:10 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Tue Feb 5 05:54:10 2019 +0000

    Stream file handles have to be 64 bits to support Win64.
    
    Patch by: me

diff --git a/tools/inc/tools/stream.hxx b/tools/inc/tools/stream.hxx
index 9466b261f592..2e859196d433 100644
--- a/tools/inc/tools/stream.hxx
+++ b/tools/inc/tools/stream.hxx
@@ -733,7 +733,7 @@ private:
     String          aFilename;
     sal_uInt16      nLockCounter;
     sal_Bool            bIsOpen;
-    sal_uInt32      GetFileHandle() const;
+    sal_uIntPtr     GetFileHandle() const;
 
     // Forbidden and not implemented.
     SvFileStream (const SvFileStream&);
diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 99c21571a1a6..fbd5911f13dc 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -322,7 +322,7 @@ SvFileStream::~SvFileStream()
 |*
 *************************************************************************/
 
-sal_uInt32 SvFileStream::GetFileHandle() const
+sal_uIntPtr SvFileStream::GetFileHandle() const
 {
     return (sal_uInt32)pInstanceData->nHandle;
 }
commit ce0079de993261454795767fafe5d976f4a325ff
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Tue Feb 5 05:29:42 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Tue Feb 5 05:29:42 2019 +0000

    Port main/i18npool to gbuild.
    
    Allow ICU's version.mk to be used by GNU make (= instead of *=).
    
    Add support for building generated C files.
    
    Reference ICU libraries using "gb_Library_use_externals" across the tree.
    Also ICU is an external library, remove it from RepositoryFixes.mk
    which is only for internal ones, and keep it in RepositoryExternal.mk
    exclusively. Since we get to specify the full linker parameter over there,
    remove the half-baked hacks for it from RepositoryFixes.mk.
    
    Patch by: me

diff --git a/Module_ooo.mk b/Module_ooo.mk
index 5cf64514bac2..a098c6cfe6f2 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
     formula \
     fpicker \
     framework \
+    i18npool \
     i18nutil \
     idl \
     idlc \
diff --git a/Repository.mk b/Repository.mk
index dca0d0c7b275..93cb75765037 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -29,6 +29,10 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     bmpsum \
     checksingleton \
     g2g \
+    gencoll_rule \
+    genconv_dict \
+    gendict \
+    genindex_data \
     mkunroll \
     rdbedit \
     rdbmaker \
@@ -36,6 +40,7 @@ $(eval $(call gb_Helper_register_executables,NONE, \
     rsc2 \
     rscdep \
     rscpp \
+    saxparser \
     so_checksum \
     srvdepy \
     svidl \
@@ -85,6 +90,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     basegfx \
     cached1 \
     canvastools \
+    collator_data \
     communi \
     cppcanvas \
     ctl \
@@ -97,6 +103,8 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     dbpool \
     dbtools \
     desktop_detector \
+    dict_ja \
+    dict_zh \
     dnd \
     drawinglayer \
     dtrans \
@@ -119,10 +127,15 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     fwm \
     guesslang \
     i18npaper \
+    index_data \
     java_uno_accessbridge \
     juh \
     juhx \
     lng \
+    localedata_en \
+    localedata_es \
+    localedata_euro \
+    localedata_others \
     mcnttype \
     msfilter \
     msword \
@@ -166,6 +179,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     sysdtrans \
     textconversiondlgs \
     ootk \
+    textconv_dict \
     tl \
     tvhlp1 \
     ucpchelp1 \
@@ -250,6 +264,8 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
     gdipluscanvas \
     hatchwindowfactory \
     hyphen_uno \
+    i18npool \
+    i18nsearch \
     lnth \
     nullcanvas \
     passwordcontainer \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 669330608c8d..20c2367713bd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -287,6 +287,12 @@ endif # SYSTEM_GRAPHITE
 
 ifeq ($(SYSTEM_ICU),YES)
 
+define gb_LinkTarget__use_icudata
+$(call gb_LinkTarget_add_libs,$(1),-licudata)
+endef
+define gb_LinkTarget__use_icui18n
+$(call gb_LinkTarget_add_libs,$(1),-licui18n)
+endef
 define gb_LinkTarget__use_icule
 $(call gb_LinkTarget_add_libs,$(1),-licule)
 endef
@@ -296,20 +302,48 @@ endef
 
 else # !SYSTEM_ICU
 
-$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
-    icule \
-    icuuc \
-))
+define gb_LinkTarget__use_icudata
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icudata.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licudt40)
+else ifeq ($(OS),OS2)
+$(call gb_LinkTarget_add_libs,$(1),-licudt)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licudata)
+endif
+endef
+
+define gb_LinkTarget__use_icui18n
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icuin.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licuin40)
+else ifeq ($(OS),OS2)
+$(call gb_LinkTarget_add_libs,$(1),-licuin)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licui18n)
+endif
+endef
 
 define gb_LinkTarget__use_icule
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-    icule \
-)
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icule.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licule40)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licule)
+endif
 endef
+
 define gb_LinkTarget__use_icuuc
-$(call gb_LinkTarget_add_linked_libs,$(1),\
-    icuuc \
-)
+ifeq ($(OS)$(COM),WNTMSC)
+$(call gb_LinkTarget_add_libs,$(1),icuuc.lib)
+else ifeq ($(OS)$(COM),WNTGCC)
+$(call gb_LinkTarget_add_libs,$(1),-licuuc40)
+else
+$(call gb_LinkTarget_add_libs,$(1),-licuuc)
+endif
 endef
 
 endif # SYSTEM_ICU
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 770076337604..6d1364d1de67 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -107,11 +107,6 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES
 # all other libraries built by AOO and all platform libraries (exceptions see below) are used without an import library
 # we link against their dlls in gcc format directly
 gb_Library_NOILIBFILENAMES:=\
-    icudt \
-    icuin \
-    icule \
-    icutu \
-    icuuc \
     uwinapi \
     winmm \
 
@@ -130,11 +125,6 @@ gb_Library_DLLFILENAMES += $(foreach lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PS
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:hyphen.uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess$(gb_Library_MAJORVER)%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
@@ -163,12 +153,6 @@ gb_Library_FILENAMES := $(patsubst stl:istl%,stl:msvcprt%,$(gb_Library_FILENAMES
 
 # change the names of all import libraries that don't have an "i" prefix as in our standard naming schema
 gb_Library_NOILIBFILENAMES := $(gb_Library_PLAINLIBS_NONE)
-gb_Library_NOILIBFILENAMES += \
-    icudt \
-    icuin \
-    icule \
-    icutu \
-    icuuc
 
 gb_Library_FILENAMES := $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
 gb_Library_FILENAMES += $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
@@ -180,11 +164,6 @@ gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
 
 gb_Library_DLLFILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelp%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:hyphen.uno%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icudt:icudt%,icudt:icudt40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icuin:icuin%,icuin:icuin40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icule:icule%,icule:icule40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icutu:icutu%,icutu:icutu40%,$(gb_Library_DLLFILENAMES))
-gb_Library_DLLFILENAMES := $(patsubst icuuc:icuuc%,icuuc:icuuc40%,$(gb_Library_DLLFILENAMES))
 gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
 
 endif # ifneq ($(USE_MINGW),)
@@ -255,12 +234,7 @@ gb_Library_DLLFILENAMES := $(patsubst uuresolver:uuresolver%,uuresolver:uuresolv
 gb_Library_DLLFILENAMES := $(patsubst ucpexpand1:ucpexpand1%,ucpexpand1:ucpexpan%,$(gb_Library_DLLFILENAMES))
 
 gb_Library_NOILIBFILENAMES:=\
-    ft2lib \
-    icudt \
-    icuin \
-    icule \
-    icutu \
-    icuuc
+    ft2lib
 
 gb_Library_ILIBFILENAMES:=\
     ft2lib \
diff --git a/i18npool/Executable_gencoll_rule.mk b/i18npool/Executable_gencoll_rule.mk
new file mode 100644
index 000000000000..e7b47d069cc0
--- /dev/null
+++ b/i18npool/Executable_gencoll_rule.mk
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Executable_Executable,gencoll_rule))
+
+$(eval $(call gb_Executable_add_precompiled_header,gencoll_rule,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
+
+$(eval $(call gb_Executable_set_include,gencoll_rule,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Executable_add_api,gencoll_rule,\
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gencoll_rule,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(call gb_Executable_use_external,gencoll_rule,icui18n)
+$(call gb_Executable_use_external,gencoll_rule,icudata)
+$(call gb_Executable_use_external,gencoll_rule,icuuc)
+
+$(eval $(call gb_Executable_add_exception_objects,gencoll_rule,\
+	i18npool/source/collator/gencoll_rule \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Executable_genconv_dict.mk b/i18npool/Executable_genconv_dict.mk
new file mode 100644
index 000000000000..366493c37c67
--- /dev/null
+++ b/i18npool/Executable_genconv_dict.mk
@@ -0,0 +1,45 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Executable_Executable,genconv_dict))
+
+$(eval $(call gb_Executable_add_precompiled_header,genconv_dict,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
+
+$(eval $(call gb_Executable_set_include,genconv_dict,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,genconv_dict,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,genconv_dict,\
+	i18npool/source/textconversion/genconv_dict \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Executable_gendict.mk b/i18npool/Executable_gendict.mk
new file mode 100644
index 000000000000..1eafe4ac311d
--- /dev/null
+++ b/i18npool/Executable_gendict.mk
@@ -0,0 +1,45 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Executable_Executable,gendict))
+
+$(eval $(call gb_Executable_add_precompiled_header,gendict,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
+
+$(eval $(call gb_Executable_set_include,gendict,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Executable_add_linked_libs,gendict,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,gendict,\
+	i18npool/source/breakiterator/gendict \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Executable_genindex_data.mk b/i18npool/Executable_genindex_data.mk
new file mode 100644
index 000000000000..24da3b7c1d5d
--- /dev/null
+++ b/i18npool/Executable_genindex_data.mk
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Executable_Executable,genindex_data))
+
+$(eval $(call gb_Executable_add_precompiled_header,genindex_data,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
+
+$(eval $(call gb_Executable_set_include,genindex_data,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Executable_add_api,genindex_data,\
+#	offapi \
+#	udkapi \
+#))
+
+$(eval $(call gb_Executable_add_linked_libs,genindex_data,\
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(call gb_Executable_use_external,genindex_data,icudata)
+$(call gb_Executable_use_external,genindex_data,icui18n)
+$(call gb_Executable_use_external,genindex_data,icuuc)
+
+$(eval $(call gb_Executable_add_exception_objects,genindex_data,\
+	i18npool/source/indexentry/genindex_data \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Executable_saxparser.mk b/i18npool/Executable_saxparser.mk
new file mode 100644
index 000000000000..23bbd0ddd271
--- /dev/null
+++ b/i18npool/Executable_saxparser.mk
@@ -0,0 +1,73 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Executable_Executable,saxparser))
+
+$(eval $(call gb_Executable_add_precompiled_header,saxparser,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
+
+$(eval $(call gb_Executable_set_include,saxparser,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Executable_add_api,saxparser,\
+	offapi \
+	udkapi \
+))
+
+# the xmlparser build breaks in this header file
+# 
+#      /opt/SUNWspro/WS6U1/include/CC/Cstd/./limits
+#
+# which defines a class with member functions called min() and max().
+# the build breaks because in solar.h, there is something like this
+# 
+#      #define max(x,y) ((x) < (y) ? (y) : (x))
+#      #define min(x,y) ((x) < (y) ? (x) : (y))
+#
+# so the only choice is to prevent "CC/Cstd/./limits" from being 
+# included:
+ifeq ($(OS),SOLARIS)
+$(eval $(call gb_Executable_add_defs,saxparser,\
+	-D__STD_LIMITS \
+))
+endif
+
+
+$(eval $(call gb_Executable_add_linked_libs,saxparser,\
+	cppu \
+	cppuhelper \
+	sal \
+	stl \
+    $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Executable_add_exception_objects,saxparser,\
+	i18npool/source/localedata/saxparser \
+	i18npool/source/localedata/LocaleNode \
+	i18npool/source/localedata/filewriter \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Library_collator_data.mk b/i18npool/Library_collator_data.mk
new file mode 100644
index 000000000000..6c0aba81bb12
--- /dev/null
+++ b/i18npool/Library_collator_data.mk
@@ -0,0 +1,62 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,collator_data))
+
+$(eval $(call gb_Library_set_include,collator_data,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,collator_data, \
+#	offapi \
+#	udkapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,collator_data,\
+#	-DI18NPOOL_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_set_versionmap,collator_data,$(SRCDIR)/i18npool/source/collator/data/collator_data.map))
+
+$(eval $(call gb_Library_add_linked_libs,collator_data,\
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,collator_data,\
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),CustomTarget/i18npool/source/collator/data/collator_$(notdir $(basename $(txt)))) \
+))
+
+$(WORKDIR)/CustomTarget/i18npool/source/collator/data/collator_%.cxx : $(SRCDIR)/i18npool/source/collator/data/%.txt $(OUTDIR)/bin/gencoll_rule$(gb_Executable_EXT)
+	mkdir -p $(dir $@) && \
+	$(gb_Augment_Library_Path) $(OUTDIR)/bin/gencoll_rule$(gb_Executable_EXT) \
+		$(call gb_Helper_convert_native,$<) \
+		$(call gb_Helper_convert_native,$@) \
+		$*
+
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_dict_ja.mk b/i18npool/Library_dict_ja.mk
new file mode 100644
index 000000000000..177621465049
--- /dev/null
+++ b/i18npool/Library_dict_ja.mk
@@ -0,0 +1,53 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dict_ja))
+
+$(eval $(call gb_Library_set_include,dict_ja,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,dict_ja, \
+#        udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_Library_set_versionmap,dict_ja,$(SRCDIR)/i18npool/source/breakiterator/data/dict.map))
+
+$(eval $(call gb_Library_add_linked_libs,dict_ja,\
+	$(gb_STDLIBS) \
+))
+
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/dict_%.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic $(OUTDIR)/bin/gendict$(gb_Executable_EXT)
+	mkdir -p $(dir $@) && \
+	$(gb_Augment_Library_Path) $(OUTDIR)/bin/gendict$(gb_Executable_EXT) $(call gb_Helper_convert_native,$<) $(call gb_Helper_convert_native,$@)
+
+$(eval $(call gb_Library_add_generated_exception_objects,dict_ja,\
+	CustomTarget/i18npool/source/breakiterator/data/dict_ja \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_dict_zh.mk b/i18npool/Library_dict_zh.mk
new file mode 100644
index 000000000000..78cd6d0a5889
--- /dev/null
+++ b/i18npool/Library_dict_zh.mk
@@ -0,0 +1,53 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dict_zh))
+
+$(eval $(call gb_Library_set_include,dict_zh,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,dict_zh, \
+#        udkapi \
+#	offapi \
+#))
+
+$(eval $(call gb_Library_set_versionmap,dict_zh,$(SRCDIR)/i18npool/source/breakiterator/data/dict.map))
+
+$(eval $(call gb_Library_add_linked_libs,dict_zh,\
+	$(gb_STDLIBS) \
+))
+
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/dict_%.cxx : $(SRCDIR)/i18npool/source/breakiterator/data/%.dic $(OUTDIR)/bin/gendict$(gb_Executable_EXT)
+	mkdir -p $(dir $@) && \
+	$(gb_Augment_Library_Path) $(OUTDIR)/bin/gendict$(gb_Executable_EXT) $(call gb_Helper_convert_native,$<) $(call gb_Helper_convert_native,$@)
+
+$(eval $(call gb_Library_add_generated_exception_objects,dict_zh,\
+	CustomTarget/i18npool/source/breakiterator/data/dict_zh \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_i18nisolang1.mk b/i18npool/Library_i18nisolang1.mk
new file mode 100644
index 000000000000..54cd544b8090
--- /dev/null
+++ b/i18npool/Library_i18nisolang1.mk
@@ -0,0 +1,59 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,i18nisolang1))
+
+$(eval $(call gb_Library_add_package_headers,i18nisolang1,i18npool_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,i18nisolang1,$(SRCDIR)/i18npool/inc/pch/precompiled_i18nisolang))
+
+$(eval $(call gb_Library_set_include,i18nisolang1,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,i18nisolang1, \
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,i18nisolang1,\
+	-DI18NPOOL_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,i18nisolang1,\
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,i18nisolang1,\
+	i18npool/source/isolang/insys \
+	i18npool/source/isolang/isolang \
+	i18npool/source/isolang/mslangid \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_i18npaper.mk b/i18npool/Library_i18npaper.mk
new file mode 100644
index 000000000000..d27aa32e08f3
--- /dev/null
+++ b/i18npool/Library_i18npaper.mk
@@ -0,0 +1,60 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,i18npaper))
+
+$(eval $(call gb_Library_add_package_headers,i18npaper,i18npool_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,i18npaper,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npaper))
+
+$(eval $(call gb_Library_set_include,i18npaper,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,i18npaper, \
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,i18npaper,\
+	-DI18NPOOL_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,i18npaper,\
+	comphelper \
+	cppu \
+	i18nisolang1 \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,i18npaper,\
+	i18npool/source/paper/paper \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_i18npool.mk b/i18npool/Library_i18npool.mk
new file mode 100644
index 000000000000..caa159764bed
--- /dev/null
+++ b/i18npool/Library_i18npool.mk
@@ -0,0 +1,203 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,i18npool))
+
+$(eval $(call gb_Library_add_package_headers,i18npool,i18npool_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,i18npool,$(SRCDIR)/i18npool/inc/pch/precompiled_i18npool))
+
+$(eval $(call gb_Library_set_componentfile,i18npool,i18npool/util/i18npool))
+
+$(eval $(call gb_Library_set_include,i18npool,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(WORKDIR)/CustomTarget/i18npool/source/collator \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,i18npool, \
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,i18npool,\
+	-DI18NPOOL_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,i18npool,\
+	comphelper \
+	cppu \
+	cppuhelper \
+	i18nisolang1 \
+	i18nutil \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_external,i18npool,icui18n)
+$(call gb_Library_use_external,i18npool,icudata)
+$(call gb_Library_use_external,i18npool,icuuc)
+
+$(eval $(call gb_Library_add_exception_objects,i18npool,\
+	i18npool/source/registerservices/registerservices \
+	i18npool/source/breakiterator/breakiteratorImpl \
+	i18npool/source/breakiterator/breakiterator_cjk \
+	i18npool/source/breakiterator/breakiterator_ctl \
+	i18npool/source/breakiterator/breakiterator_th \
+	i18npool/source/breakiterator/breakiterator_unicode \
+	i18npool/source/breakiterator/xdictionary \
+	i18npool/source/characterclassification/characterclassificationImpl \
+	i18npool/source/characterclassification/cclass_unicode \
+	i18npool/source/characterclassification/cclass_unicode_parser \
+	i18npool/source/characterclassification/scripttypedetector \
+	i18npool/source/transliteration/transliteration_body \
+	i18npool/source/transliteration/transliteration_caseignore \
+	i18npool/source/transliteration/transliterationImpl \
+	i18npool/source/transliteration/transliteration_commonclass \
+	i18npool/source/transliteration/transliteration_OneToOne \
+	i18npool/source/transliteration/transliteration_Ignore \
+	i18npool/source/transliteration/transliteration_Numeric \
+	i18npool/source/transliteration/hiraganaToKatakana \
+	i18npool/source/transliteration/katakanaToHiragana \
+	i18npool/source/transliteration/ignoreKana \
+	i18npool/source/transliteration/halfwidthToFullwidth \
+	i18npool/source/transliteration/fullwidthToHalfwidth \
+	i18npool/source/transliteration/ignoreWidth \
+	i18npool/source/transliteration/smallToLarge_ja_JP \
+	i18npool/source/transliteration/largeToSmall_ja_JP \
+	i18npool/source/transliteration/ignoreSize_ja_JP \
+	i18npool/source/transliteration/ignoreMinusSign_ja_JP \
+	i18npool/source/transliteration/ignoreIterationMark_ja_JP \
+	i18npool/source/transliteration/ignoreTraditionalKana_ja_JP \
+	i18npool/source/transliteration/ignoreTraditionalKanji_ja_JP \
+	i18npool/source/transliteration/ignoreProlongedSoundMark_ja_JP \
+	i18npool/source/transliteration/ignoreZiZu_ja_JP \
+	i18npool/source/transliteration/ignoreBaFa_ja_JP \
+	i18npool/source/transliteration/ignoreTiJi_ja_JP \
+	i18npool/source/transliteration/ignoreHyuByu_ja_JP \
+	i18npool/source/transliteration/ignoreSeZe_ja_JP \
+	i18npool/source/transliteration/ignoreIandEfollowedByYa_ja_JP \
+	i18npool/source/transliteration/ignoreKiKuFollowedBySa_ja_JP \
+	i18npool/source/transliteration/ignoreSeparator_ja_JP \
+	i18npool/source/transliteration/ignoreSpace_ja_JP \
+	i18npool/source/transliteration/ignoreMiddleDot_ja_JP \
+	i18npool/source/transliteration/textToPronounce_zh \
+	i18npool/source/transliteration/numtochar \
+	i18npool/source/transliteration/numtotext_cjk \
+	i18npool/source/transliteration/chartonum \
+	i18npool/source/transliteration/texttonum \
+	i18npool/source/calendar/calendarImpl \
+	i18npool/source/calendar/calendar_gregorian \
+	i18npool/source/calendar/calendar_hijri \
+	i18npool/source/calendar/calendar_jewish \
+	i18npool/source/numberformatcode/numberformatcode \
+	i18npool/source/defaultnumberingprovider/defaultnumberingprovider \
+	i18npool/source/nativenumber/nativenumbersupplier \
+	i18npool/source/inputchecker/inputsequencechecker \
+	i18npool/source/inputchecker/inputsequencechecker_th \
+	i18npool/source/inputchecker/inputsequencechecker_hi \
+	i18npool/source/ordinalsuffix/ordinalsuffix \
+	i18npool/source/localedata/localedata \
+	i18npool/source/indexentry/indexentrysupplier \
+	i18npool/source/indexentry/indexentrysupplier_asian \
+	i18npool/source/indexentry/indexentrysupplier_ja_phonetic \
+	i18npool/source/indexentry/indexentrysupplier_default \
+	i18npool/source/indexentry/indexentrysupplier_common \
+	i18npool/source/textconversion/textconversionImpl \
+	i18npool/source/textconversion/textconversion \
+	i18npool/source/textconversion/textconversion_ko \
+	i18npool/source/textconversion/textconversion_zh \
+	i18npool/source/collator/collatorImpl \
+	i18npool/source/collator/chaptercollator \
+	i18npool/source/collator/collator_unicode \
+))
+
+$(call gb_Library_get_headers_target,i18npool) : $(WORKDIR)/CustomTarget/i18npool/source/collator/lrl_include.hxx
+
+$(WORKDIR)/CustomTarget/i18npool/source/collator/lrl_include.hxx : $(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt)
+	mkdir -p $(dir $@) \
+	&& LOCAL_RULE_LANGS="$(sort $(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/collator/data/*.txt),$(firstword $(subst _, ,$(notdir $(txt))))))" \
+	&& echo \#define LOCAL_RULE_LANGS \"$${LOCAL_RULE_LANGS}\" > $@
+
+
+# fdo#31271 ")" reclassified in more recent ICU/Unicode Standards
+include $(OUTDIR)/inc/icuversion.mk
+ICU_RECLASSIFIED_BRACKET := $(shell [ ${ICU_MAJOR} -ge 5 -o \( ${ICU_MAJOR} -eq 4 -a ${ICU_MINOR} -ge 4 \) ] && echo YES)
+
+
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%.txt : $(SRCDIR)/i18npool/source/breakiterator/data/%.txt
+ifeq ($(ICU_RECLASSIFIED_BRACKET),YES)
+	mkdir -p $(dir $@) && \
+	sed "s#\[:LineBreak =  Close_Punctuation:\]#\[\[:LineBreak =  Close_Punctuation:\] \[:LineBreak = Close_Parenthesis:\]\]#" $< > $@
+else
+	mkdir -p $(dir $@) && \
+	cp $< $@
+endif
+
+
+ifeq ($(SYSTEM_ICU),YES)
+GENCMN := $(SYSTEM_GENCMN)
+GENBRK := $(SYSTEM_GENBRK)
+GENCCODE := $(SYSTEM_GENCCODE)
+else
+GENCMN := $(gb_Augment_Library_Path) $(OUTDIR)/bin/gencmn$(gb_Executable_EXT)
+GENBRK := $(gb_Augment_Library_Path) $(OUTDIR)/bin/genbrk$(gb_Executable_EXT)
+GENCCODE := $(gb_Augment_Library_Path) $(OUTDIR)/bin/genccode$(gb_Executable_EXT)
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%.brk : $(OUTDIR)/bin/genbrk$(gb_Executable_EXT)
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%_brk.c: $(OUTDIR)/bin/genccode$(gb_Executable_EXT)
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/OpenOffice_dat.c : $(OUTDIR)/bin/gencmn$(gb_Executable_EXT)
+endif
+
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%.brk : $(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%.txt
+	$(GENBRK) -r $(call gb_Helper_convert_native,$<) -o $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/$*.brk)
+
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%_brk.c : $(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/%.brk
+	$(GENCCODE) -n OpenOffice -d $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data) $(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/$*.brk)
+
+# 'gencmn', 'genbrk' and 'genccode' are tools generated and delivered by icu project to process icu breakiterator rules.
+# The output of gencmn generates warnings under Windows. We want to minimize the patches to external tools,
+# so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to disable the warnings.
+# Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
+$(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/OpenOffice_dat.c : $(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt)
+	RESPONSEFILE=$(call var2filecr,$(shell $(gb_MKTEMP)),1,$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt),$(notdir $(basename $(txt))).brk)) \
+	&& cat $${RESPONSEFILE} \
+	&& $(GENCMN) -n OpenOffice -t tmp -S -d $(call gb_Helper_convert_native,$(dir $@)) O $(call gb_Helper_convert_native,$${RESPONSEFILE}) \
+	&& echo "#ifdef _MSC_VER" > $@ \
+	&& echo "#pragma warning( disable : 4229 4668 )" >> $@ \
+	&& echo "#endif" >> $@ \
+	&& cat $(WORKDIR)/CustomTarget/i18npool/source/breakiterator/data/OpenOffice_tmp.c >> $@ \
+	&& rm -f $${RESPONSEFILE}
+
+#$(eval $(call gb_Library_add_generated_cobjects,i18npool,\
+#	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt),CustomTarget/i18npool/source/breakiterator/data/$(notdir $(basename $(txt)))_brk) \
+#))
+
+$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/breakiterator/data/*.txt),$(eval $(call gb_Library_add_generated_cobject,i18npool,CustomTarget/i18npool/source/breakiterator/data/$(notdir $(basename $(txt)))_brk)))
+
+$(eval $(call gb_Library_add_generated_cobject,i18npool,CustomTarget/i18npool/source/breakiterator/data/OpenOffice_dat))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_i18nsearch.mk b/i18npool/Library_i18nsearch.mk
new file mode 100644
index 000000000000..b34332d2b2d8
--- /dev/null
+++ b/i18npool/Library_i18nsearch.mk
@@ -0,0 +1,67 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,i18nsearch))
+
+$(eval $(call gb_Library_add_package_headers,i18nsearch,i18npool_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,i18nsearch,$(SRCDIR)/i18npool/inc/pch/precompiled_search))
+
+$(eval $(call gb_Library_set_componentfile,i18nsearch,i18npool/source/search/i18nsearch))
+
+$(eval $(call gb_Library_set_include,i18nsearch,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,i18nsearch, \
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,i18nsearch,\
+	-DI18NPOOL_DLLIMPLEMENTATION \
+))
+
+$(eval $(call gb_Library_add_linked_libs,i18nsearch,\
+	cppu \
+	cppuhelper \
+	i18nisolang1 \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(call gb_Library_use_external,i18nsearch,icui18n)
+$(call gb_Library_use_external,i18nsearch,icuuc)
+
+
+$(eval $(call gb_Library_add_exception_objects,i18nsearch,\
+	i18npool/source/search/levdis \
+	i18npool/source/search/textsearch \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_index_data.mk b/i18npool/Library_index_data.mk
new file mode 100644
index 000000000000..1a8427fc48bd
--- /dev/null
+++ b/i18npool/Library_index_data.mk
@@ -0,0 +1,54 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,index_data))
+
+$(eval $(call gb_Library_set_include,index_data,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,index_data, \
+#	offapi \
+#	udkapi \
+#))
+
+$(eval $(call gb_Library_set_versionmap,index_data,$(SRCDIR)/i18npool/source/indexentry/data/index_data.map))
+
+$(eval $(call gb_Library_add_linked_libs,index_data,\
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(WORKDIR)/CustomTarget/i18npool/source/indexentry/data/%.cxx : $(SRCDIR)/i18npool/source/indexentry/data/%.txt $(OUTDIR)/bin/genindex_data$(gb_Executable_EXT)
+	mkdir -p $(dir $@) && \
+	$(gb_Augment_Library_Path) $(OUTDIR)/bin/genindex_data$(gb_Executable_EXT) $(call gb_Helper_convert_native,$<) $(call gb_Helper_convert_native,$@) $*
+
+$(eval $(call gb_Library_add_generated_exception_objects,index_data,\
+	$(foreach txt,$(wildcard $(SRCDIR)/i18npool/source/indexentry/data/*.txt),CustomTarget/i18npool/source/indexentry/data/$(notdir $(basename $(txt)))) \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_localedata_en.mk b/i18npool/Library_localedata_en.mk
new file mode 100644
index 000000000000..33256dfeac15
--- /dev/null
+++ b/i18npool/Library_localedata_en.mk
@@ -0,0 +1,100 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,localedata_en))
+
+$(eval $(call gb_Library_set_include,localedata_en,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,localedata_en, \
+#	offapi \
+#	udkapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,localedata_en,\
+#	-DI18NPOOL_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_set_versionmap,localedata_en,$(SRCDIR)/i18npool/source/localedata/data/localedata_en.map))
+
+$(eval $(call gb_Library_add_linked_libs,localedata_en,\
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,localedata_en,\
+	CustomTarget/i18npool/source/localedata/data/localedata_en_AU \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_BZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_CA \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_GB \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_GH \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_IE \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_JM \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_NA \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_NZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_PH \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_TT \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_US \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_ZW \
+))
+
+ifeq ($(OS),WNT)
+URL_PROTOCOL=file:///
+else
+URL_PROTOCOL=file://
+endif
+
+$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/localedata_%.cxx : $(SRCDIR)/i18npool/source/localedata/data/%.xml $(OUTDIR)/bin/saxparser$(gb_Executable_EXT) $(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.rdb
+	$(gb_Augment_Library_Path) $(OUTDIR)/bin/saxparser$(gb_Executable_EXT) \
+		$* \
+		$(call gb_Helper_convert_native,$<) \
+		$(call gb_Helper_convert_native,$@) \
+		$(URL_PROTOCOL)$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.rdb) \
+		$(call gb_Helper_convert_native,$(OUTDIR)/bin/types.rdb) \
+		-env:OOO_INBUILD_SHAREDLIB_DIR=$(URL_PROTOCOL)$(call gb_Helper_convert_native,$(gb_InBuild_Library_Path))
+
+MY_COMPONENT := sax/source/expatwrap/expwrap
+
+$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.rdb : \
+			$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input \
+			$(SOLARENV)/bin/packcomponents.xslt \
+			$(call gb_ComponentTarget_get_outdir_inbuild_target,$(MY_COMPONENT))
+	$(gb_XSLTPROC) \
+		--nonet \
+		--stringparam prefix $(call gb_Helper_convert_native,$(OUTDIR)/xml/) \
+		-o $(call gb_Helper_convert_native,$@) \
+		$(call gb_Helper_convert_native,$(SOLARENV)/bin/packcomponents.xslt) \
+		$(call gb_Helper_convert_native,$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input)
+
+$(WORKDIR)/CustomTarget/i18npool/source/localedata/data/saxparser.input :
+	mkdir -p $(dir $@) \
+	&& echo "<list><filename>component/$(MY_COMPONENT).inbuild.component</filename></list>" > $@
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_localedata_es.mk b/i18npool/Library_localedata_es.mk
new file mode 100644
index 000000000000..455bde5fadac
--- /dev/null
+++ b/i18npool/Library_localedata_es.mk
@@ -0,0 +1,76 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,localedata_es))
+
+$(eval $(call gb_Library_set_include,localedata_es,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,localedata_es, \
+#	offapi \
+#	udkapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,localedata_es,\
+#	-DI18NPOOL_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_set_versionmap,localedata_es,$(SRCDIR)/i18npool/source/localedata/data/localedata_es.map))
+
+$(eval $(call gb_Library_add_linked_libs,localedata_es,\
+	localedata_en \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,localedata_es,\
+	CustomTarget/i18npool/source/localedata/data/localedata_es_AR \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_BO \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_CL \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_CO \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_CR \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_DO \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_EC \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_ES \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_GT \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_HN \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_MX \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_NI \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_PA \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_PE \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_PR \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_PY \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_SV \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_UY \
+	CustomTarget/i18npool/source/localedata/data/localedata_es_VE \
+	CustomTarget/i18npool/source/localedata/data/localedata_gl_ES \
+))
+
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_localedata_euro.mk b/i18npool/Library_localedata_euro.mk
new file mode 100644
index 000000000000..4f53f70783f2
--- /dev/null
+++ b/i18npool/Library_localedata_euro.mk
@@ -0,0 +1,130 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,localedata_euro))
+
+$(eval $(call gb_Library_set_include,localedata_euro,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,localedata_euro, \
+#	offapi \
+#	udkapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,localedata_euro,\
+#	-DI18NPOOL_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_set_versionmap,localedata_euro,$(SRCDIR)/i18npool/source/localedata/data/localedata_euro.map))
+
+$(eval $(call gb_Library_add_linked_libs,localedata_euro,\
+	localedata_en \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,localedata_euro,\
+	CustomTarget/i18npool/source/localedata/data/localedata_ast_ES \
+	CustomTarget/i18npool/source/localedata/data/localedata_be_BY \
+	CustomTarget/i18npool/source/localedata/data/localedata_bg_BG \
+	CustomTarget/i18npool/source/localedata/data/localedata_br_FR \
+	CustomTarget/i18npool/source/localedata/data/localedata_bs_BA \
+	CustomTarget/i18npool/source/localedata/data/localedata_ca_ES \
+	CustomTarget/i18npool/source/localedata/data/localedata_cs_CZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_cv_RU \
+	CustomTarget/i18npool/source/localedata/data/localedata_cy_GB \
+	CustomTarget/i18npool/source/localedata/data/localedata_da_DK \
+	CustomTarget/i18npool/source/localedata/data/localedata_de_AT \
+	CustomTarget/i18npool/source/localedata/data/localedata_de_CH \
+	CustomTarget/i18npool/source/localedata/data/localedata_de_DE \
+	CustomTarget/i18npool/source/localedata/data/localedata_de_LI \
+	CustomTarget/i18npool/source/localedata/data/localedata_de_LU \
+	CustomTarget/i18npool/source/localedata/data/localedata_dsb_DE \
+	CustomTarget/i18npool/source/localedata/data/localedata_el_GR \
+	CustomTarget/i18npool/source/localedata/data/localedata_et_EE \
+	CustomTarget/i18npool/source/localedata/data/localedata_eu \
+	CustomTarget/i18npool/source/localedata/data/localedata_fi_FI \
+	CustomTarget/i18npool/source/localedata/data/localedata_fo_FO \
+	CustomTarget/i18npool/source/localedata/data/localedata_fr_BE \
+	CustomTarget/i18npool/source/localedata/data/localedata_fr_CA \
+	CustomTarget/i18npool/source/localedata/data/localedata_fr_CH \
+	CustomTarget/i18npool/source/localedata/data/localedata_fr_FR \
+	CustomTarget/i18npool/source/localedata/data/localedata_fr_LU \
+	CustomTarget/i18npool/source/localedata/data/localedata_fr_MC \
+	CustomTarget/i18npool/source/localedata/data/localedata_fur_IT \
+	CustomTarget/i18npool/source/localedata/data/localedata_fy_NL \
+	CustomTarget/i18npool/source/localedata/data/localedata_ga_IE \
+	CustomTarget/i18npool/source/localedata/data/localedata_gd_GB \
+	CustomTarget/i18npool/source/localedata/data/localedata_gsc_FR \
+	CustomTarget/i18npool/source/localedata/data/localedata_hr_HR \
+	CustomTarget/i18npool/source/localedata/data/localedata_hsb_DE \
+	CustomTarget/i18npool/source/localedata/data/localedata_is_IS \
+	CustomTarget/i18npool/source/localedata/data/localedata_it_CH \
+	CustomTarget/i18npool/source/localedata/data/localedata_it_IT \
+	CustomTarget/i18npool/source/localedata/data/localedata_ka_GE \
+	CustomTarget/i18npool/source/localedata/data/localedata_kl_GL \
+	CustomTarget/i18npool/source/localedata/data/localedata_la_VA \
+	CustomTarget/i18npool/source/localedata/data/localedata_lb_LU \
+	CustomTarget/i18npool/source/localedata/data/localedata_lt_LT \
+	CustomTarget/i18npool/source/localedata/data/localedata_ltg_LV \
+	CustomTarget/i18npool/source/localedata/data/localedata_lv_LV \
+	CustomTarget/i18npool/source/localedata/data/localedata_mk_MK \
+	CustomTarget/i18npool/source/localedata/data/localedata_mt_MT \
+	CustomTarget/i18npool/source/localedata/data/localedata_nb_NO \
+	CustomTarget/i18npool/source/localedata/data/localedata_nds_DE \
+	CustomTarget/i18npool/source/localedata/data/localedata_nl_BE \
+	CustomTarget/i18npool/source/localedata/data/localedata_nl_NL \
+	CustomTarget/i18npool/source/localedata/data/localedata_nn_NO \
+	CustomTarget/i18npool/source/localedata/data/localedata_no_NO \
+	CustomTarget/i18npool/source/localedata/data/localedata_oc_FR \
+	CustomTarget/i18npool/source/localedata/data/localedata_pl_PL \
+	CustomTarget/i18npool/source/localedata/data/localedata_pt_BR \
+	CustomTarget/i18npool/source/localedata/data/localedata_pt_PT \
+	CustomTarget/i18npool/source/localedata/data/localedata_ro_RO \
+	CustomTarget/i18npool/source/localedata/data/localedata_ru_RU \
+	CustomTarget/i18npool/source/localedata/data/localedata_rue_SK \
+	CustomTarget/i18npool/source/localedata/data/localedata_sc_IT \
+	CustomTarget/i18npool/source/localedata/data/localedata_sh_ME \
+	CustomTarget/i18npool/source/localedata/data/localedata_sh_RS \
+	CustomTarget/i18npool/source/localedata/data/localedata_sh_YU \
+	CustomTarget/i18npool/source/localedata/data/localedata_sk_SK \
+	CustomTarget/i18npool/source/localedata/data/localedata_sl_SI \
+	CustomTarget/i18npool/source/localedata/data/localedata_sr_ME \
+	CustomTarget/i18npool/source/localedata/data/localedata_sr_RS \
+	CustomTarget/i18npool/source/localedata/data/localedata_sr_YU \
+	CustomTarget/i18npool/source/localedata/data/localedata_sv_FI \
+	CustomTarget/i18npool/source/localedata/data/localedata_sv_SE \
+	CustomTarget/i18npool/source/localedata/data/localedata_tr_TR \
+	CustomTarget/i18npool/source/localedata/data/localedata_tt_RU \
+	CustomTarget/i18npool/source/localedata/data/localedata_uk_UA \
+	CustomTarget/i18npool/source/localedata/data/localedata_wa_BE \
+))
+
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_localedata_others.mk b/i18npool/Library_localedata_others.mk
new file mode 100644
index 000000000000..d1191ad8fc21
--- /dev/null
+++ b/i18npool/Library_localedata_others.mk
@@ -0,0 +1,141 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,localedata_others))
+
+$(eval $(call gb_Library_set_include,localedata_others,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+#$(eval $(call gb_Library_add_api,localedata_others, \
+#	offapi \
+#	udkapi \
+#))
+
+#$(eval $(call gb_Library_add_defs,localedata_others,\
+#	-DI18NPOOL_DLLIMPLEMENTATION \
+#))
+
+$(eval $(call gb_Library_set_versionmap,localedata_others,$(SRCDIR)/i18npool/source/localedata/data/localedata_others.map))
+
+$(eval $(call gb_Library_add_linked_libs,localedata_others,\
+	localedata_en \
+	sal \
+	stl \
+	$(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,localedata_others,\
+	CustomTarget/i18npool/source/localedata/data/localedata_af_NA \
+	CustomTarget/i18npool/source/localedata/data/localedata_af_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_ak_GH \
+	CustomTarget/i18npool/source/localedata/data/localedata_am_ET \
+	CustomTarget/i18npool/source/localedata/data/localedata_ar_DZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_ar_EG \
+	CustomTarget/i18npool/source/localedata/data/localedata_ar_LB \
+	CustomTarget/i18npool/source/localedata/data/localedata_ar_OM \
+	CustomTarget/i18npool/source/localedata/data/localedata_ar_SA \
+	CustomTarget/i18npool/source/localedata/data/localedata_ar_TN \
+	CustomTarget/i18npool/source/localedata/data/localedata_az_AZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_bn_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_bn_BD \
+	CustomTarget/i18npool/source/localedata/data/localedata_dz_BT \
+	CustomTarget/i18npool/source/localedata/data/localedata_ee_GH \
+	CustomTarget/i18npool/source/localedata/data/localedata_en_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_eo \
+	CustomTarget/i18npool/source/localedata/data/localedata_fa_IR \
+	CustomTarget/i18npool/source/localedata/data/localedata_gu_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_gug_PY \
+	CustomTarget/i18npool/source/localedata/data/localedata_haw_US \
+	CustomTarget/i18npool/source/localedata/data/localedata_ha_GH \
+	CustomTarget/i18npool/source/localedata/data/localedata_he_IL \
+	CustomTarget/i18npool/source/localedata/data/localedata_hi_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_hil_PH \
+	CustomTarget/i18npool/source/localedata/data/localedata_ht_HT \
+	CustomTarget/i18npool/source/localedata/data/localedata_hu_HU \
+	CustomTarget/i18npool/source/localedata/data/localedata_hy_AM \
+	CustomTarget/i18npool/source/localedata/data/localedata_ia \
+	CustomTarget/i18npool/source/localedata/data/localedata_id_ID \
+	CustomTarget/i18npool/source/localedata/data/localedata_ja_JP \
+	CustomTarget/i18npool/source/localedata/data/localedata_jbo \
+	CustomTarget/i18npool/source/localedata/data/localedata_kab_DZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_kk_KZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_km_KH \
+	CustomTarget/i18npool/source/localedata/data/localedata_kn_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_ko_KR \
+	CustomTarget/i18npool/source/localedata/data/localedata_ku_TR \
+	CustomTarget/i18npool/source/localedata/data/localedata_ky_KG \
+	CustomTarget/i18npool/source/localedata/data/localedata_lg_UG \
+	CustomTarget/i18npool/source/localedata/data/localedata_lif_NP \
+	CustomTarget/i18npool/source/localedata/data/localedata_ln_CD \
+	CustomTarget/i18npool/source/localedata/data/localedata_lo_LA \
+	CustomTarget/i18npool/source/localedata/data/localedata_mai_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_ml_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_mn_MN \
+	CustomTarget/i18npool/source/localedata/data/localedata_mr_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_ms_MY \
+	CustomTarget/i18npool/source/localedata/data/localedata_my_MM \
+	CustomTarget/i18npool/source/localedata/data/localedata_ne_NP \
+	CustomTarget/i18npool/source/localedata/data/localedata_nr_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_nso_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_om_ET \
+	CustomTarget/i18npool/source/localedata/data/localedata_or_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_pa_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_plt_MG \
+	CustomTarget/i18npool/source/localedata/data/localedata_rw_RW \
+	CustomTarget/i18npool/source/localedata/data/localedata_sg_CF \
+	CustomTarget/i18npool/source/localedata/data/localedata_shs_CA \
+	CustomTarget/i18npool/source/localedata/data/localedata_so_SO \
+	CustomTarget/i18npool/source/localedata/data/localedata_ss_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_st_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_sw_TZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_ta_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_te_IN \
+	CustomTarget/i18npool/source/localedata/data/localedata_tg_TJ \
+	CustomTarget/i18npool/source/localedata/data/localedata_th_TH \
+	CustomTarget/i18npool/source/localedata/data/localedata_ti_ER \
+	CustomTarget/i18npool/source/localedata/data/localedata_tk_TM \
+	CustomTarget/i18npool/source/localedata/data/localedata_tn_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_tpi_PG \
+	CustomTarget/i18npool/source/localedata/data/localedata_ts_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_ug_CN \
+	CustomTarget/i18npool/source/localedata/data/localedata_ur_PK \
+	CustomTarget/i18npool/source/localedata/data/localedata_uz_UZ \
+	CustomTarget/i18npool/source/localedata/data/localedata_ve_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_vi_VN \
+	CustomTarget/i18npool/source/localedata/data/localedata_xh_ZA \
+	CustomTarget/i18npool/source/localedata/data/localedata_yi_US \
+	CustomTarget/i18npool/source/localedata/data/localedata_zh_CN \
+	CustomTarget/i18npool/source/localedata/data/localedata_zh_HK \
+	CustomTarget/i18npool/source/localedata/data/localedata_zh_MO \
+	CustomTarget/i18npool/source/localedata/data/localedata_zh_SG \
+	CustomTarget/i18npool/source/localedata/data/localedata_zh_TW \
+	CustomTarget/i18npool/source/localedata/data/localedata_zu_ZA \
+))
+
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Library_textconv_dict.mk b/i18npool/Library_textconv_dict.mk
new file mode 100644
index 000000000000..a038650f54b8
--- /dev/null
+++ b/i18npool/Library_textconv_dict.mk
@@ -0,0 +1,66 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,textconv_dict))
+
+$(eval $(call gb_Library_set_include,textconv_dict,\
+	$$(INCLUDE) \
+	-I$(SRCDIR)/i18npool/inc \
+	-I$(SRCDIR)/i18npool/inc/pch \
+	-I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,textconv_dict, \
+	offapi \
+	udkapi \
+))
+
+$(eval $(call gb_Library_set_versionmap,textconv_dict,$(SRCDIR)/i18npool/source/textconversion/data/textconv_dict.map))
+
+$(eval $(call gb_Library_add_linked_libs,textconv_dict,\
+	stl \
+	$(gb_STDLIBS) \
+))
+ifeq ($(OS),WNT)
+$(eval $(call gb_Library_add_linked_libs,textconv_dict,\
+	cppu \
+	cppuhelper \
+	sal \
+))
+else ifeq ($(OS),OS2)
+$(eval $(call gb_Library_add_linked_libs,textconv_dict,\
+	cppu \
+	sal \
+))
+endif
+
+$(WORKDIR)/CustomTarget/i18npool/source/textconversion/data/%.cxx : $(SRCDIR)/i18npool/source/textconversion/data/%.dic $(OUTDIR)/bin/genconv_dict$(gb_Executable_EXT)
+	mkdir -p $(dir $@) && \
+	$(gb_Augment_Library_Path) $(OUTDIR)/bin/genconv_dict$(gb_Executable_EXT) $* $(call gb_Helper_convert_native,$<) $(call gb_Helper_convert_native,$@)
+
+$(eval $(call gb_Library_add_generated_exception_objects,textconv_dict,\
+	$(foreach dict,$(wildcard $(SRCDIR)/i18npool/source/textconversion/data/*.dic),CustomTarget/i18npool/source/textconversion/data/$(notdir $(basename $(dict)))) \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/i18npool/Makefile b/i18npool/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/i18npool/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Module_i18npool.mk b/i18npool/Module_i18npool.mk
new file mode 100644
index 000000000000..753a156343f2
--- /dev/null
+++ b/i18npool/Module_i18npool.mk
@@ -0,0 +1,81 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,i18npool))
+
+$(eval $(call gb_Module_add_targets,i18npool,\
+	Executable_gencoll_rule \
+	Executable_genconv_dict \
+	Executable_gendict \
+	Executable_genindex_data \
+	Executable_saxparser \
+	Library_collator_data \
+	Library_dict_ja \
+	Library_dict_zh \
+	Library_i18nisolang1 \
+	Library_i18npaper \
+	Library_i18npool \
+	Library_i18nsearch \
+	Library_index_data \
+	Library_localedata_en \
+	Library_localedata_es \
+	Library_localedata_euro \
+	Library_localedata_others \
+	Library_textconv_dict \
+	Package_inc \
+	Package_version \
+	Package_xml \
+))
+
+
+# What's left to do:
+#
+# DONE inp  i18npool\inc                               nmake   -   all inp_inc NULL
+# DONE inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_inc NULL
+# DONE  i18npool\source\breakiterator              nmake   -   all inp_brkit inp_inc NULL
+# DONE inp  i18npool\source\characterclassification    nmake   -   all inp_chclass inp_inc NULL
+# DONE inp  i18npool\source\breakiterator\data         nmake   -   all inp_dict inp_brkit inp_inc NULL
+# DONE inp  i18npool\source\transliteration            nmake   -   all inp_translit inp_inc NULL
+# DONE inp  i18npool\source\isolang                    nmake   -   all inp_isolang inp_inc NULL
+# DONE inp  i18npool\source\localedata                 nmake   -   all inp_localedata inp_isolang inp_inc NULL
+# DONE  i18npool\source\localedata\data            nmake   -   all inp_locdata_data inp_localedata inp_inc NULL
+# DONE inp  i18npool\source\paper                      nmake   -   all inp_paper inp_isolang inp_inc NULL
+# DONE inp  i18npool\source\calendar                   nmake   -   all inp_cal inp_inc NULL
+# DONE inp  i18npool\source\numberformatcode           nmake   -   all inp_numformat inp_inc NULL
+# DONE inp  i18npool\source\defaultnumberingprovider   nmake   -   all inp_dnum inp_inc NULL
+# DONE inp  i18npool\source\nativenumber               nmake   -   all inp_natnum inp_inc NULL
+# DONE inp  i18npool\source\indexentry                 nmake   -   all inp_index inp_inc NULL
+# TEST  i18npool\source\indexentry\data            nmake   -   all inp_index_data inp_index inp_inc NULL
+# DONE  i18npool\source\collator                   nmake   -   all inp_collator inp_inc NULL
+# DONE  i18npool\source\collator\data              nmake   -   all inp_collator_data inp_collator inp_inc NULL
+# DONE inp  i18npool\source\inputchecker               nmake   -   all inp_inputchecker inp_inc NULL
+# DONE inp  i18npool\source\textconversion             nmake   -   all inp_textconversion inp_inc NULL
+# DONE inp  i18npool\source\textconversion\data        nmake   -   all inp_textconv_dict inp_textconversion inp_inc NULL
+# DONE inp  i18npool\source\search                     nmake   -   all inp_search inp_inc NULL
+# DONE inp  i18npool\source\ordinalsuffix              nmake   -   all inp_ordinalsuffix NULL
+# inp  i18npool\util                              nmake   -   all inp_util inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index inp_index_data 
+#                                                                          inp_collator inp_collator_data inp_inputchecker inp_textconversion inp_textconv_dict inp_search inp_isolang inp_paper inp_ordinalsuffix NULL
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/i18npool/Package_inc.mk b/i18npool/Package_inc.mk
new file mode 100644
index 000000000000..7e901558af17
--- /dev/null
+++ b/i18npool/Package_inc.mk
@@ -0,0 +1,28 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,i18npool_inc,$(SRCDIR)/i18npool/inc))
+$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/i18npooldllapi.h,i18npool/i18npooldllapi.h))
+$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/lang.h,i18npool/lang.h))
+$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/mslangid.hxx,i18npool/mslangid.hxx))
+$(eval $(call gb_Package_add_file,i18npool_inc,inc/i18npool/paper.hxx,i18npool/paper.hxx))
diff --git a/i18npool/Package_version.mk b/i18npool/Package_version.mk
new file mode 100644
index 000000000000..1225a572abf1
--- /dev/null
+++ b/i18npool/Package_version.mk
@@ -0,0 +1,27 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,i18npool_version,$(SRCDIR)/i18npool))
+
+$(eval $(call gb_Package_add_file,i18npool_version,inc/i18npool/version.mk,version.mk))
+
diff --git a/i18npool/Package_xml.mk b/i18npool/Package_xml.mk
new file mode 100644
index 000000000000..c3b5466a2648
--- /dev/null
+++ b/i18npool/Package_xml.mk
@@ -0,0 +1,38 @@
+###############################################################
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,i18npool_xml,$(SRCDIR)/i18npool/xml))
+
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/BreakIterator.xml,BreakIterator.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/Calendar.xml,Calendar.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/ChapterCollator.xml,ChapterCollator.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/CharacterClassification.xml,CharacterClassification.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/Collator.xml,Collator.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/DefaultNumberingProvider.xml,DefaultNumberingProvider.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/IndexEntrySupplier.xml,IndexEntrySupplier.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/LocaleData.xml,LocaleData.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/NumberFormatCodeMapper.xml,NumberFormatCodeMapper.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/OrdinalSuffix.xml,OrdinalSuffix.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/TextSearch.xml,TextSearch.xml))
+$(eval $(call gb_Package_add_file,i18npool_xml,xml/Transliteration.xml,Transliteration.xml))
+
diff --git a/i18npool/inc/pch/precompiled_i18nisolang.cxx b/i18npool/inc/pch/precompiled_i18nisolang.cxx
new file mode 100644
index 000000000000..5e82283c77da
--- /dev/null
+++ b/i18npool/inc/pch/precompiled_i18nisolang.cxx
@@ -0,0 +1,25 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "precompiled_i18npool.hxx"
+
diff --git a/i18npool/inc/pch/precompiled_i18nisolang.hxx b/i18npool/inc/pch/precompiled_i18nisolang.hxx
new file mode 100644
index 000000000000..c586fc7d611f
--- /dev/null
+++ b/i18npool/inc/pch/precompiled_i18nisolang.hxx
@@ -0,0 +1,28 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:49.201981
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+
diff --git a/i18npool/inc/pch/precompiled_i18npaper.cxx b/i18npool/inc/pch/precompiled_i18npaper.cxx
new file mode 100644
index 000000000000..5e82283c77da
--- /dev/null
+++ b/i18npool/inc/pch/precompiled_i18npaper.cxx
@@ -0,0 +1,25 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "precompiled_i18npool.hxx"
+
diff --git a/i18npool/inc/pch/precompiled_i18npaper.hxx b/i18npool/inc/pch/precompiled_i18npaper.hxx
new file mode 100644
index 000000000000..c586fc7d611f
--- /dev/null
+++ b/i18npool/inc/pch/precompiled_i18npaper.hxx
@@ -0,0 +1,28 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:49.201981
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+
diff --git a/i18npool/inc/pch/precompiled_search.cxx b/i18npool/inc/pch/precompiled_search.cxx
new file mode 100644
index 000000000000..5e82283c77da
--- /dev/null
+++ b/i18npool/inc/pch/precompiled_search.cxx
@@ -0,0 +1,25 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+#include "precompiled_i18npool.hxx"
+
diff --git a/i18npool/inc/pch/precompiled_search.hxx b/i18npool/inc/pch/precompiled_search.hxx
new file mode 100644
index 000000000000..c586fc7d611f
--- /dev/null
+++ b/i18npool/inc/pch/precompiled_search.hxx
@@ -0,0 +1,28 @@
+/**************************************************************
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:49.201981
+
+#ifdef PRECOMPILED_HEADERS
+#endif
+
diff --git a/i18npool/prj/build.lst b/i18npool/prj/build.lst
index eb59f2f7d428..de67285cd556 100644
--- a/i18npool/prj/build.lst
+++ b/i18npool/prj/build.lst
@@ -1,26 +1,2 @@
 inp  i18npool    :   bridges sax stoc comphelper ICU:icu i18nutil LIBXSLT:libxslt NULL
-inp  i18npool                                   usr1    -   all inp_mkout NULL
-inp  i18npool\inc                               nmake   -   all inp_inc NULL
-inp  i18npool\source\registerservices           nmake   -   all inp_rserv inp_inc NULL
-inp  i18npool\source\breakiterator              nmake   -   all inp_brkit inp_inc NULL
-inp  i18npool\source\characterclassification    nmake   -   all inp_chclass inp_inc NULL
-inp  i18npool\source\breakiterator\data         nmake   -   all inp_dict inp_brkit inp_inc NULL
-inp  i18npool\source\transliteration            nmake   -   all inp_translit inp_inc NULL
-inp  i18npool\source\isolang                    nmake   -   all inp_isolang inp_inc NULL
-inp  i18npool\source\localedata                 nmake   -   all inp_localedata inp_isolang inp_inc NULL
-inp  i18npool\source\localedata\data            nmake   -   all inp_locdata_data inp_localedata inp_inc NULL
-inp  i18npool\source\paper	                nmake   -   all inp_paper inp_isolang inp_inc NULL
-inp  i18npool\source\calendar                   nmake   -   all inp_cal inp_inc NULL
-inp  i18npool\source\numberformatcode           nmake   -   all inp_numformat inp_inc NULL
-inp  i18npool\source\defaultnumberingprovider   nmake   -   all inp_dnum inp_inc NULL
-inp  i18npool\source\nativenumber               nmake   -   all inp_natnum inp_inc NULL
-inp  i18npool\source\indexentry                 nmake   -   all inp_index inp_inc NULL
-inp  i18npool\source\indexentry\data            nmake   -   all inp_index_data inp_index inp_inc NULL
-inp  i18npool\source\collator                   nmake   -   all inp_collator inp_inc NULL
-inp  i18npool\source\collator\data              nmake   -   all inp_collator_data inp_collator inp_inc NULL
-inp  i18npool\source\inputchecker               nmake   -   all inp_inputchecker inp_inc NULL
-inp  i18npool\source\textconversion             nmake   -   all inp_textconversion inp_inc NULL
-inp  i18npool\source\textconversion\data        nmake   -   all inp_textconv_dict inp_textconversion inp_inc NULL
-inp  i18npool\source\search                     nmake   -   all inp_search inp_inc NULL
-inp  i18npool\source\ordinalsuffix              nmake   -   all inp_ordinalsuffix NULL
-inp  i18npool\util                              nmake   -   all inp_util inp_brkit inp_dict inp_chclass inp_translit inp_cal inp_dnum inp_natnum inp_localedata inp_locdata_data inp_numformat inp_rserv inp_index inp_index_data inp_collator inp_collator_data inp_inputchecker inp_textconversion inp_textconv_dict inp_search inp_isolang inp_paper inp_ordinalsuffix NULL
+inp  i18npool\prj                               nmake   -   all inp_prj NULL
diff --git a/i18npool/prj/d.lst b/i18npool/prj/d.lst
index 6973abf5bf44..e69de29bb2d1 100644
--- a/i18npool/prj/d.lst
+++ b/i18npool/prj/d.lst
@@ -1,52 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%
-..\xml\*.xml %_DEST%\xml%_EXT%\*.xml
-
-mkdir: %_DEST%\inc%_EXT%\i18npool
-
-..\inc\i18npool\*.* %_DEST%\inc%_EXT%\i18npool\*.*
-
-..\%__SRC%\bin\i18npoo*.dll %_DEST%\bin%_EXT%\i18npoo*.dll
-..\%__SRC%\lib\i18npool.uno.so %_DEST%\lib%_EXT%\i18npool.uno.so
-..\%__SRC%\lib\i18npool.uno.dylib %_DEST%\lib%_EXT%\i18npool.uno.dylib
-
-..\%__SRC%\bin\i18nsea*.dll %_DEST%\bin%_EXT%\i18nsea*.dll
-..\%__SRC%\lib\i18nsearch.uno.so %_DEST%\lib%_EXT%\i18nsearch.uno.so
-..\%__SRC%\lib\i18nsearch.uno.dylib %_DEST%\lib%_EXT%\i18nsearch.uno.dylib
-
-..\%__SRC%\bin\localedata_*.dll %_DEST%\bin%_EXT%\localedata_*.dll
-..\%__SRC%\bin\ld_*.dll %_DEST%\bin%_EXT%\ld_*.dll
-..\%__SRC%\lib\liblocaledata_*.so %_DEST%\lib%_EXT%\liblocaledata_*.so
-..\%__SRC%\lib\liblocaledata_*.dylib %_DEST%\lib%_EXT%\liblocaledata_*.dylib
-
-..\%__SRC%\bin\dict_*.dll %_DEST%\bin%_EXT%\dict_*.dll
-..\%__SRC%\lib\libdict_*.so %_DEST%\lib%_EXT%\libdict_*.so
-..\%__SRC%\lib\libdict_*.dylib %_DEST%\lib%_EXT%\libdict_*.dylib
-
-..\%__SRC%\bin\collator*.dll %_DEST%\bin%_EXT%\collator*.dll
-..\%__SRC%\lib\libcollator_data.so %_DEST%\lib%_EXT%\libcollator_data.so
-..\%__SRC%\lib\libcollator_data.dylib %_DEST%\lib%_EXT%\libcollator_data.dylib
-
-..\%__SRC%\bin\index_da*.dll %_DEST%\bin%_EXT%\index_da*.dll
-..\%__SRC%\lib\libindex_data.so %_DEST%\lib%_EXT%\libindex_data.so
-..\%__SRC%\lib\libindex_data.dylib %_DEST%\lib%_EXT%\libindex_data.dylib
-
-..\%__SRC%\bin\textconv*.dll %_DEST%\bin%_EXT%\textconv*.dll
-..\%__SRC%\lib\libtextconv_dict.so %_DEST%\lib%_EXT%\libtextconv_dict.so
-..\%__SRC%\lib\libtextconv_dict.dylib %_DEST%\lib%_EXT%\libtextconv_dict.dylib
-
-..\version.mk  %_DEST%\inc%_EXT%\i18npool\version.mk
-
-..\%__SRC%\lib\ii18nisolang*.lib %_DEST%\lib%_EXT%\ii18nisolang*.lib
-..\%__SRC%\lib\i18nisolang*.lib %_DEST%\lib%_EXT%\i18nisolang*.lib
-..\%__SRC%\bin\i18nisol*.dll %_DEST%\bin%_EXT%\i18nisol*.dll
-..\%__SRC%\lib\libi18nisolang*.so %_DEST%\lib%_EXT%\libi18nisolang*.so
-..\%__SRC%\lib\libi18nisolang*.dylib %_DEST%\lib%_EXT%\libi18nisolang*.dylib
-
-..\%__SRC%\lib\ii18npaper*.lib %_DEST%\lib%_EXT%\ii18npaper*.lib
-..\%__SRC%\lib\i18npaper*.lib %_DEST%\lib%_EXT%\i18npaper*.lib
-..\%__SRC%\bin\i18npape*.dll %_DEST%\bin%_EXT%\i18npape*.dll
-..\%__SRC%\lib\libi18npaper*.so %_DEST%\lib%_EXT%\libi18npaper*.so
-..\%__SRC%\lib\libi18npaper*.dylib %_DEST%\lib%_EXT%\libi18npaper*.dylib
-
-..\%__SRC%\misc\i18npool.component %_DEST%\xml%_EXT%\i18npool.component
-..\%__SRC%\misc\i18nsearch.component %_DEST%\xml%_EXT%\i18nsearch.component
diff --git a/i18npool/prj/makefile.mk b/i18npool/prj/makefile.mk
new file mode 100644
index 000000000000..c62c6a657d16
--- /dev/null
+++ b/i18npool/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#  
+#  Licensed to the Apache Software Foundation (ASF) under one
+#  or more contributor license agreements.  See the NOTICE file
+#  distributed with this work for additional information
+#  regarding copyright ownership.  The ASF licenses this file
+#  to you under the Apache License, Version 2.0 (the
+#  "License"); you may not use this file except in compliance
+#  with the License.  You may obtain a copy of the License at
+#  
+#    http://www.apache.org/licenses/LICENSE-2.0
+#  
+#  Unless required by applicable law or agreed to in writing,
+#  software distributed under the License is distributed on an
+#  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+#  KIND, either express or implied.  See the License for the
+#  specific language governing permissions and limitations
+#  under the License.
+#  
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+    cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index 02f656121cdc..6bcd7fdb11a9 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -187,11 +187,11 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
     fprintf (cfp, "\n};\n");
 
     // create function to return arrays
-    fprintf (cfp, "\tconst sal_uInt8* getExistMark() { return existMark; }\n");
-    fprintf (cfp, "\tconst sal_Int16* getIndex1() { return index1; }\n");
-    fprintf (cfp, "\tconst sal_Int32* getIndex2() { return index2; }\n");
-    fprintf (cfp, "\tconst sal_Int32* getLenArray() { return lenArray; }\n");
-    fprintf (cfp, "\tconst sal_Unicode* getDataArea() { return dataArea; }\n");
+    fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_uInt8* getExistMark() { return existMark; }\n");
+    fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Int16* getIndex1() { return index1; }\n");
+    fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Int32* getIndex2() { return index2; }\n");
+    fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Int32* getLenArray() { return lenArray; }\n");
+    fprintf (cfp, "\tSAL_DLLPUBLIC_EXPORT const sal_Unicode* getDataArea() { return dataArea; }\n");
     fprintf (cfp, "}\n");
 
     fclose(sfp);
diff --git a/i18npool/source/breakiterator/makefile.mk b/i18npool/source/breakiterator/makefile.mk
index 2b960652a0d0..96b872ca8abd 100644
--- a/i18npool/source/breakiterator/makefile.mk
+++ b/i18npool/source/breakiterator/makefile.mk
@@ -96,6 +96,8 @@ $(MISC)$/%_brk.c : $(MISC)$/%.brk
 # so the output (OpenOffice_icu_dat.c) is changed here to include a pragma to disable the warnings.
 # Output of gencmn is redirected to OpenOffice_icu_tmp.c with the -t switch.
 $(MISC)$/OpenOffice_%.c : $(MY_BRK_BRKFILES:s/.brk/_brk.c/)
+    echo $(GENCMN) -n OpenOffice -t tmp -S -d $(MISC) O $(mktmp $(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
+    cat $(mktmp $(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
     $(WRAPCMD) $(GENCMN) -n OpenOffice -t tmp -S -d $(MISC) O $(mktmp $(subst,$(MISC)$/, $(MY_BRK_BRKFILES:t"\n")))
     echo $(USQ)#ifdef _MSC_VER$(USQ) > $@
     echo $(USQ)#pragma warning( disable : 4229 4668 )$(USQ) >> $@
diff --git a/i18npool/source/collator/gencoll_rule.cxx b/i18npool/source/collator/gencoll_rule.cxx
index 2fb266c30be7..db9b9b9ca9c5 100644
--- a/i18npool/source/collator/gencoll_rule.cxx
+++ b/i18npool/source/collator/gencoll_rule.cxx
@@ -68,7 +68,7 @@ void data_write(char* file, char* name, sal_uInt8 *data, sal_Int32 len)
     }
     fprintf(fp, "\n};\n\n");
 
-    fprintf(fp, "const sal_uInt8* get_%s() { return %s; }\n\n", name, name);
+    fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt8* get_%s() { return %s; }\n\n", name, name);
     fprintf (fp, "}\n");
 
     fclose(fp);
diff --git a/i18npool/source/indexentry/genindex_data.cxx b/i18npool/source/indexentry/genindex_data.cxx
index 82f48c9bc800..22731b7250d8 100644
--- a/i18npool/source/indexentry/genindex_data.cxx
+++ b/i18npool/source/indexentry/genindex_data.cxx
@@ -154,7 +154,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
         fprintf(fp, "\n};\n\n");
     }
 
-    fprintf(fp, "const sal_uInt16** get_%s(sal_Int16 &max_index)\n{\n\tstatic const sal_uInt16 *idx[]={idx1, idx2, idx3};\n\tmax_index=0x%x;\n\treturn idx;\n}\n\n", argv[3], static_cast<unsigned int>(max_index));
+    fprintf(fp, "SAL_DLLPUBLIC_EXPORT const sal_uInt16** get_%s(sal_Int16 &max_index)\n{\n\tstatic const sal_uInt16 *idx[]={idx1, idx2, idx3};\n\tmax_index=0x%x;\n\treturn idx;\n}\n\n", argv[3], static_cast<unsigned int>(max_index));
     fprintf (fp, "}\n");
 
     fclose(fp);
diff --git a/i18npool/source/isolang/insys.cxx b/i18npool/source/isolang/insys.cxx
index 790eb626e5fb..447b54800ee9 100644
--- a/i18npool/source/isolang/insys.cxx
+++ b/i18npool/source/isolang/insys.cxx
@@ -22,7 +22,7 @@
 
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_i18npool.hxx"
+#include "precompiled_i18nisolang.hxx"
 
 #if defined( WNT )
 
diff --git a/i18npool/source/isolang/inunx.cxx b/i18npool/source/isolang/inunx.cxx
index 9dd1b0461155..5262ac82d1b4 100644
--- a/i18npool/source/isolang/inunx.cxx
+++ b/i18npool/source/isolang/inunx.cxx
@@ -22,7 +22,7 @@
 
 
 
-// no include "precompiled_i18npool.hxx" because this file is included in insys.cxx
+// no include "precompiled_i18nisolang.hxx" because this file is included in insys.cxx
 
 #include <stdlib.h>  // for getenv()
 #include <stdio.h>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list