Module_ooo.mk | 1
Repository.mk | 6
RepositoryExternal.mk | 105
+++++++++
RepositoryFixes.mk | 17 +
lingucomponent/Library_MacOSXSpell.mk | 67
++++++
lingucomponent/Library_guesslang.mk | 66
++++++
lingucomponent/Library_hyphen_uno.mk | 71
++++++
lingucomponent/Library_lnth.mk | 71
++++++
lingucomponent/Library_spell.mk | 71
++++++
lingucomponent/Makefile | 32 ++
lingucomponent/Module_lingucomponent.mk | 51 ++++
lingucomponent/Package_config.mk | 28 ++
lingucomponent/StaticLibrary_ulingu.mk | 51 ++++
lingucomponent/inc/pch/precompiled_guesslang.cxx | 25 ++
lingucomponent/inc/pch/precompiled_guesslang.hxx | 29 ++
lingucomponent/inc/pch/precompiled_hyphen.cxx | 25 ++
lingucomponent/inc/pch/precompiled_hyphen.hxx | 29 ++
lingucomponent/inc/pch/precompiled_lnth.cxx | 25 ++
lingucomponent/inc/pch/precompiled_lnth.hxx | 29 ++
lingucomponent/inc/pch/precompiled_mac.cxx | 25 ++
lingucomponent/inc/pch/precompiled_mac.hxx | 29 ++
lingucomponent/inc/pch/precompiled_spell.cxx | 25 ++
lingucomponent/inc/pch/precompiled_spell.hxx | 29 ++
lingucomponent/prj/build.lst | 10
lingucomponent/prj/d.lst | 53 ----
lingucomponent/prj/makefile.mk | 40 +--
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx | 6
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx | 2
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 105
---------
lingucomponent/source/languageguessing/altstrfunc.cxx | 2
lingucomponent/source/languageguessing/guess.cxx | 2
lingucomponent/source/languageguessing/guesslang.cxx | 6
lingucomponent/source/languageguessing/makefile.mk | 88
--------
lingucomponent/source/languageguessing/simpleguesser.cxx | 2
lingucomponent/source/spellcheck/macosxspell/macreg.cxx | 6
lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx | 2
lingucomponent/source/spellcheck/macosxspell/makefile.mk | 92
--------
lingucomponent/source/spellcheck/spell/exports.dxp | 2
lingucomponent/source/spellcheck/spell/makefile.mk | 107
----------
lingucomponent/source/spellcheck/spell/sreg.cxx | 6
lingucomponent/source/spellcheck/spell/sspellimp.cxx | 2
lingucomponent/source/thesaurus/libnth/exports.dxp | 2
lingucomponent/source/thesaurus/libnth/makefile.mk | 107
----------
lingucomponent/source/thesaurus/libnth/nthesdta.cxx | 2
lingucomponent/source/thesaurus/libnth/nthesimp.cxx | 2
lingucomponent/source/thesaurus/libnth/ntreg.cxx | 6
postprocess/packcomponents/makefile.mk | 12 -
solenv/gbuild/LinkTarget.mk | 4
49 files changed, 954 insertions(+), 623 deletions(-)
New commits:
commit e0f59ea0d587ac0cfc3081732a6a4ab030e7a457
Author: Damjan Jovanovic <dam...@apache.org>
Date: Fri Mar 30 19:16:11 2018 +0000
Port main/lingucomponent to gbuild.
Patch by: me
diff --git a/Module_ooo.mk b/Module_ooo.mk
index ea4d80539b67..bec3c6d60e4e 100644
--- a/Module_ooo.mk
+++ b/Module_ooo.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
io \
javaunohelper \
jvmaccess \
+ lingucomponent \
linguistic \
o3tl \
offapi \
diff --git a/Repository.mk b/Repository.mk
index 02745716c7b7..1aadac0059c6 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -57,6 +57,7 @@ $(eval $(call gb_Helper_register_executables,UREBIN, \
$(eval $(call gb_Helper_register_libraries,OOOLIBS, \
AppleRemote \
+ MacOSXSpell \
adabas \
adabasui \
agg \
@@ -102,6 +103,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwk \
fwl \
fwm \
+ guesslang \
i18npaper \
juh \
juhx \
@@ -220,10 +222,13 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
fsstorage \
gdipluscanvas \
hatchwindowfactory \
+ hyphen_uno \
+ lnth \
nullcanvas \
passwordcontainer \
simplecanvas \
slideshow \
+ spell \
streams \
textinstream \
textoutstream \
@@ -260,6 +265,7 @@ $(eval $(call
gb_Helper_register_static_libraries,PLAINLIBS, \
sldshw_s \
vclmain \
udm \
+ ulingu \
))
# vim: set noet sw=4 ts=4:
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 486da512f384..14b24a772cb7 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -551,4 +551,109 @@ endef
endif # SYSTEM_COINMP
+
+ifeq ($(SYSTEM_HYPH),YES)
+
+define gb_LinkTarget__use_hyphen
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DSYSTEM_HYPH \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(HYPHEN_LIB))
+endef
+
+else # !SYSTEM_HYPH
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
+ hyphen \
+))
+
+define gb_LinkTarget__use_hyphen
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ hyphen \
+)
+endef
+
+endif # SYSTEM_HYPH
+
+
+ifeq ($(SYSTEM_LIBTEXTCAT),YES)
+
+define gb_LinkTarget__use_libtextcat
+$(call gb_LinkTarget_add_libs,$(1),-ltextcat)
+endef
+
+else # !SYSTEM_LIBTEXTCAT
+
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \
+ libtextcat \
+))
+
+define gb_LinkTarget__use_libtextcat
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),libtextcat)
+else
+$(call gb_LinkTarget_add_linked_libs,$(1),textcat)
+endif
+endef
+
+endif # SYSTEM_LIBTEXTCAT
+
+
+ifeq ($(SYSTEM_MYTHES),YES)
+
+define gb_LinkTarget__use_mythes
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(MYTHES_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(MYTHES_LIBS))
+endef
+
+else # !SYSTEM_MYTHES
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,libmythes))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,mythes-1.2))
+endif
+
+define gb_LinkTarget__use_mythes
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_static_libs,$(1),libmythes)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),mythes-1.2)
+endif
+endef
+
+endif # SYSTEM_MYTHES
+
+
+ifeq ($(SYSTEM_HUNSPELL),YES)
+
+define gb_LinkTarget__use_hunspell
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(HUNSPELL_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(HUNSPELL_LIBS))
+endef
+
+else # !SYSTEM_HUNSPELL
+
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,libhunspell))
+
+define gb_LinkTarget__use_hunspell
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/hunspell \
+)
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DHUNSPELL_STATIC
+)
+$(call gb_LinkTarget_add_linked_static_libs,$(1),libhunspell)
+endef
+
+endif # SYSTEM_HUNSPELL
+
+
# vim: set noet sw=4 ts=4:
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index a3440d428381..cc32c9bababc 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -29,11 +29,14 @@ ifeq ($(OS),LINUX)
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
@@ -45,9 +48,12 @@ ifeq ($(OS),SOLARIS)
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
#$(info libnames: $(gb_Library_FILENAMES))
@@ -57,9 +63,12 @@ ifeq ($(OS),MACOSX)
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
ifneq ($(MACOSX_DEPLOYMENT_TARGET),10.4) # default to use libc++
@@ -120,6 +129,7 @@ gb_Library_DLLFILENAMES := $(filter-out $(foreach
lib,$(gb_Library_ILIBFILENAMES
gb_Library_DLLFILENAMES += $(foreach
lib,$(gb_Library_ILIBFILENAMES),$(lib):$(PSDK_HOME)/lib/$(lib)$(gb_Library_ILIBEXT))
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))
@@ -169,6 +179,7 @@ gb_Library_FILENAMES := $(patsubst
z:z%,z:zlib%,$(gb_Library_FILENAMES))
#endif
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))
@@ -212,6 +223,8 @@ gb_Library_DLLFILENAMES := $(patsubst
comphelper:comphelper%,comphelper:comphelp
gb_Library_DLLFILENAMES := $(patsubst
drawinglayer:drawinglayer%,drawinglayer:drawingl%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
fsstorage:fsstorage%,fsstorage:fsstorag%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
hatchwindowfactory:hatchwindowfactory%,hatchwindowfactory:hatchwin%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:hyphen_u%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
lnth:lnth.uno%,lnth:lnth%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
msforms:msforms.uno%,msforms:msforms%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
passwordcontainer:passwordcontainer%,passwordcontainer:password%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
productregistration:productregistration.uno%,productregistration:productr%,$(gb_Library_DLLFILENAMES))
@@ -226,6 +239,7 @@ gb_Library_DLLFILENAMES := $(patsubst
canvasfactory:canvasfactory%,canvasfactory
gb_Library_DLLFILENAMES := $(patsubst
canvastools:canvastools%,canvastools:canvasto%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
cairocanvas:cairocanvas%,cairocanvas:cairocnv%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
simplecanvas:simplecanvas%,simplecanvas:simpleca%,$(gb_Library_DLLFILENAMES))
+gb_Library_DLLFILENAMES := $(patsubst
spell:spell.uno%,spell:spell%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
vclcanvas:vclcanvas%,vclcanvas:vclcanva%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst
writerfilter:writerfilter%,writerfilter:wfilt%,$(gb_Library_DLLFILENAMES))
@@ -258,11 +272,14 @@ ifeq ($(OS),FREEBSD)
gb_Library_FILENAMES := $(patsubst
comphelper:libcomphelper%,comphelper:libcomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppuhelper:libcppuhelper%,cppuhelper:libuno_cppuhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst
spell:spell.uno%,spell:libspell.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
store:libuno_store%,store:libstore%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
stl:%,stl:libstdc++.so,$(gb_Library_FILENAMES))
diff --git a/lingucomponent/Library_MacOSXSpell.mk
b/lingucomponent/Library_MacOSXSpell.mk
new file mode 100644
index 000000000000..cd3a7dc098ea
--- /dev/null
+++ b/lingucomponent/Library_MacOSXSpell.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,MacOSXSpell))
+
+$(eval $(call
gb_Library_add_precompiled_header,MacOSXSpell,$(SRCDIR)/lingucomponent/inc/pch/precompiled_mac))
+
+$(eval $(call
gb_Library_set_componentfile,MacOSXSpell,lingucomponent/source/spellcheck/macosxspell/MacOSXSpell))
+
+$(eval $(call gb_Library_set_include,MacOSXSpell,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/lingucomponent/inc \
+ -I$(SRCDIR)/lingucomponent/inc/pch \
+ -I$(SRCDIR)/lingucomponent/source/lingutil \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,MacOSXSpell, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,MacOSXSpell,\
+ cppu \
+ cppuhelper \
+ lng \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,MacOSXSpell,\
+ -framework Cocoa \
+))
+
+$(eval $(call gb_Library_add_exception_objects,MacOSXSpell,\
+ lingucomponent/source/spellcheck/macosxspell/macreg \
+ lingucomponent/source/spellcheck/macosxspell/macspellimp \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/lingucomponent/Library_guesslang.mk
b/lingucomponent/Library_guesslang.mk
new file mode 100644
index 000000000000..a605ad15d1f1
--- /dev/null
+++ b/lingucomponent/Library_guesslang.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,guesslang))
+
+$(eval $(call
gb_Library_add_precompiled_header,guesslang,$(SRCDIR)/lingucomponent/inc/pch/precompiled_guesslang))
+
+$(eval $(call
gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
+
+$(eval $(call gb_Library_set_include,guesslang,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/lingucomponent/inc \
+ -I$(SRCDIR)/lingucomponent/inc/pch \
+ -I$(SRCDIR)/lingucomponent/source/lingutil \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,guesslang, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,guesslang,\
+ cppu \
+ cppuhelper \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_use_externals,guesslang,\
+ libtextcat \
+))
+
+$(eval $(call gb_Library_add_exception_objects,guesslang,\
+ lingucomponent/source/languageguessing/altstrfunc \
+ lingucomponent/source/languageguessing/guess \
+ lingucomponent/source/languageguessing/guesslang \
+ lingucomponent/source/languageguessing/simpleguesser \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/lingucomponent/Library_hyphen_uno.mk
b/lingucomponent/Library_hyphen_uno.mk
new file mode 100644
index 000000000000..bee8faeb25eb
--- /dev/null
+++ b/lingucomponent/Library_hyphen_uno.mk
@@ -0,0 +1,71 @@
+#**************************************************************
+#
+# 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,hyphen_uno))
+
+$(eval $(call
gb_Library_add_precompiled_header,hyphen_uno,$(SRCDIR)/lingucomponent/inc/pch/precompiled_hyphen))
+
+$(eval $(call
gb_Library_set_componentfile,hyphen_uno,lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen))
+
+$(eval $(call gb_Library_set_include,hyphen_uno,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/lingucomponent/inc \
+ -I$(SRCDIR)/lingucomponent/inc/pch \
+ -I$(SRCDIR)/lingucomponent/source/lingutil \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,hyphen_uno, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hyphen_uno,\
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ lng \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,hyphen_uno,\
+ ulingu \
+))
+
+$(eval $(call gb_Library_use_externals,hyphen_uno,\
+ hyphen \
+))
+
+$(eval $(call gb_Library_add_exception_objects,hyphen_uno,\
+ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg \
+ lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp \
+))
+
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/lingucomponent/Library_lnth.mk b/lingucomponent/Library_lnth.mk
new file mode 100644
index 000000000000..c72a9c3749df
--- /dev/null
+++ b/lingucomponent/Library_lnth.mk
@@ -0,0 +1,71 @@
+#**************************************************************
+#
+# 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,lnth))
+
+$(eval $(call
gb_Library_add_precompiled_header,lnth,$(SRCDIR)/lingucomponent/inc/pch/precompiled_lnth))
+
+$(eval $(call
gb_Library_set_componentfile,lnth,lingucomponent/source/thesaurus/libnth/lnth))
+
+$(eval $(call gb_Library_set_include,lnth,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/lingucomponent/inc \
+ -I$(SRCDIR)/lingucomponent/inc/pch \
+ -I$(SRCDIR)/lingucomponent/source/lingutil \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,lnth, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,lnth,\
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ lng \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,lnth,\
+ ulingu \
+))
+
+$(eval $(call gb_Library_use_externals,lnth,\
+ mythes \
+))
+
+$(eval $(call gb_Library_add_exception_objects,lnth,\
+ lingucomponent/source/thesaurus/libnth/nthesdta \
+ lingucomponent/source/thesaurus/libnth/nthesimp \
+ lingucomponent/source/thesaurus/libnth/ntreg \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/lingucomponent/Library_spell.mk b/lingucomponent/Library_spell.mk
new file mode 100644
index 000000000000..6fa44315941f
--- /dev/null
+++ b/lingucomponent/Library_spell.mk
@@ -0,0 +1,71 @@
+#**************************************************************
+#
+# 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,spell))
+
+$(eval $(call
gb_Library_add_precompiled_header,spell,$(SRCDIR)/lingucomponent/inc/pch/precompiled_spell))
+
+$(eval $(call
gb_Library_set_componentfile,spell,lingucomponent/source/spellcheck/spell/spell))
+
+$(eval $(call gb_Library_set_include,spell,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/lingucomponent/inc \
+ -I$(SRCDIR)/lingucomponent/inc/pch \
+ -I$(SRCDIR)/lingucomponent/source/lingutil \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,spell, \
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,spell,\
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ icuuc \
+ lng \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,spell,\
+ ulingu \
+))
+
+$(eval $(call gb_Library_use_externals,spell,\
+ hunspell \
+))
+
+$(eval $(call gb_Library_add_exception_objects,spell,\
+ lingucomponent/source/spellcheck/spell/sreg \
+ lingucomponent/source/spellcheck/spell/sspellimp \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/lingucomponent/Makefile b/lingucomponent/Makefile
new file mode 100644
index 000000000000..c1d144cbd4c9
--- /dev/null
+++ b/lingucomponent/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/lingucomponent/Module_lingucomponent.mk
b/lingucomponent/Module_lingucomponent.mk
new file mode 100644
index 000000000000..776a468613f8
--- /dev/null
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -0,0 +1,51 @@
+#**************************************************************
+#
+# 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,lingucomponent))
+
+$(eval $(call gb_Module_add_targets,lingucomponent,\
+ Package_config \
+ Library_guesslang \
+ Library_lnth \
+ StaticLibrary_ulingu \
+))
+
+ifeq ($(ENABLE_HYPHEN),YES)
+$(eval $(call gb_Module_add_targets,lingucomponent,\
+ Library_hyphen_uno \
+))
+endif
+
+ifeq ($(ENABLE_HUNSPELL),YES)
+$(eval $(call gb_Module_add_targets,lingucomponent,\
+ Library_spell \
+))
+endif
+
+ifeq ($(GUIBASE),aqua)
+$(eval $(call gb_Module_add_targets,lingucomponent,\
+ Library_MacOSXSpell \
+))
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/Package_config.mk b/lingucomponent/Package_config.mk
new file mode 100644
index 000000000000..f323c47fb386
--- /dev/null
+++ b/lingucomponent/Package_config.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,lingucomponent_config,$(SRCDIR)/lingucomponent))
+
+$(eval $(call
gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu,config/Linguistic-lingucomponent-hyphenator.xcu))
+$(eval $(call
gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu,config/Linguistic-lingucomponent-spellchecker.xcu))
+$(eval $(call
gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu,config/Linguistic-lingucomponent-thesaurus.xcu))
diff --git a/lingucomponent/StaticLibrary_ulingu.mk
b/lingucomponent/StaticLibrary_ulingu.mk
new file mode 100644
index 000000000000..2bb5cec5fd99
--- /dev/null
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -0,0 +1,51 @@
+###############################################################
+#
+# 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_StaticLibrary_StaticLibrary,ulingu))
+
+$(eval $(call gb_StaticLibrary_set_include,ulingu,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/lingucomponent/inc \
+ -I$(SRCDIR)/lingucomponent/inc/pch \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_StaticLibrary_add_api,ulingu,\
+ udkapi \
+ offapi \
+))
+
+ifeq ($(SYSTEM_DICTS),YES)
+$(eval $(call gb_StaticLibrary_add_defs,ulingu,\
+ -DSYSTEM_DICTS \
+ -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\" \
+ -DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\" \
+ -DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\" \
+))
+endif
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,ulingu,\
+ lingucomponent/source/lingutil/lingutil \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/inc/pch/precompiled_guesslang.cxx
b/lingucomponent/inc/pch/precompiled_guesslang.cxx
new file mode 100644
index 000000000000..feb96b35424f
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_guesslang.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_guesslang.hxx"
+
diff --git a/lingucomponent/inc/pch/precompiled_guesslang.hxx
b/lingucomponent/inc/pch/precompiled_guesslang.hxx
new file mode 100644
index 000000000000..3171a5c7a31d
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_guesslang.hxx
@@ -0,0 +1,29 @@
+/**************************************************************
+ *
+ * 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:51.030070
+
+#ifdef PRECOMPILED_HEADERS
+#include <tools/debug.hxx>
+#endif
+
diff --git a/lingucomponent/inc/pch/precompiled_hyphen.cxx
b/lingucomponent/inc/pch/precompiled_hyphen.cxx
new file mode 100644
index 000000000000..60c4712ed824
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_hyphen.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_hyphen.hxx"
+
diff --git a/lingucomponent/inc/pch/precompiled_hyphen.hxx
b/lingucomponent/inc/pch/precompiled_hyphen.hxx
new file mode 100644
index 000000000000..3171a5c7a31d
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_hyphen.hxx
@@ -0,0 +1,29 @@
+/**************************************************************
+ *
+ * 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:51.030070
+
+#ifdef PRECOMPILED_HEADERS
+#include <tools/debug.hxx>
+#endif
+
diff --git a/lingucomponent/inc/pch/precompiled_lnth.cxx
b/lingucomponent/inc/pch/precompiled_lnth.cxx
new file mode 100644
index 000000000000..8125438f5bf0
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_lnth.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_lnth.hxx"
+
diff --git a/lingucomponent/inc/pch/precompiled_lnth.hxx
b/lingucomponent/inc/pch/precompiled_lnth.hxx
new file mode 100644
index 000000000000..3171a5c7a31d
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_lnth.hxx
@@ -0,0 +1,29 @@
+/**************************************************************
+ *
+ * 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:51.030070
+
+#ifdef PRECOMPILED_HEADERS
+#include <tools/debug.hxx>
+#endif
+
diff --git a/lingucomponent/inc/pch/precompiled_mac.cxx
b/lingucomponent/inc/pch/precompiled_mac.cxx
new file mode 100644
index 000000000000..77082238bbfd
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_mac.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_mac.hxx"
+
diff --git a/lingucomponent/inc/pch/precompiled_mac.hxx
b/lingucomponent/inc/pch/precompiled_mac.hxx
new file mode 100644
index 000000000000..3171a5c7a31d
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_mac.hxx
@@ -0,0 +1,29 @@
+/**************************************************************
+ *
+ * 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:51.030070
+
+#ifdef PRECOMPILED_HEADERS
+#include <tools/debug.hxx>
+#endif
+
diff --git a/lingucomponent/inc/pch/precompiled_spell.cxx
b/lingucomponent/inc/pch/precompiled_spell.cxx
new file mode 100644
index 000000000000..82971132931e
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_spell.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_spell.hxx"
+
diff --git a/lingucomponent/inc/pch/precompiled_spell.hxx
b/lingucomponent/inc/pch/precompiled_spell.hxx
new file mode 100644
index 000000000000..3171a5c7a31d
--- /dev/null
+++ b/lingucomponent/inc/pch/precompiled_spell.hxx
@@ -0,0 +1,29 @@
+/**************************************************************
+ *
+ * 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:51.030070
+
+#ifdef PRECOMPILED_HEADERS
+#include <tools/debug.hxx>
+#endif
+
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 23137e6209b9..2014beda54d9 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,10 +1,2 @@
lc lingucomponent : linguistic LIBTEXTCAT:libtextcat
LIBTEXTCATDATA:libtextcat svl HYPHEN:hyphen HUNSPELL:hunspell MYTHES:mythes
LIBXSLT:libxslt NULL
-lc lingucomponent
usr1 - all lc_mkout NULL
-lc lingucomponent\inc nmake - all
lc_inc NULL
-lc lingucomponent\source\lingutil nmake - all
lc_util lc_inc NULL
-lc lingucomponent\source\thesaurus\libnth
nmake - all lc_libnth lc_util lc_inc NULL
-lc lingucomponent\source\spellcheck\spell nmake - all
lc_libspell lc_util lc_inc NULL
-lc lingucomponent\source\hyphenator\altlinuxhyph\hyphen nmake - all
lc_libhyphen lc_util lc_inc NULL
-lc lingucomponent\source\languageguessing nmake - all
lc_languageguessing lc_util lc_inc NULL
-lc lingucomponent\source\spellcheck\macosxspell nmake - all
lc_libmacosxspell lc_util lc_inc NULL
-
+lc lingucomponent\prj nmake - all
lc_prj NULL
diff --git a/lingucomponent/prj/d.lst b/lingucomponent/prj/d.lst
index 4760a299c84d..e69de29bb2d1 100644
--- a/lingucomponent/prj/d.lst
+++ b/lingucomponent/prj/d.lst
@@ -1,53 +0,0 @@
-..\%__SRC%\bin\*.dat %_DEST%\bin%_EXT%\*.dat
-..\%__SRC%\bin\*.idx %_DEST%\bin%_EXT%\*.idx
-..\%__SRC%\bin\*.aff %_DEST%\bin%_EXT%\*.aff
-..\%__SRC%\bin\*.dic %_DEST%\bin%_EXT%\*.dic
-..\%__SRC%\bin\*.lst %_DEST%\bin%_EXT%\*.lst
-
-..\%__SRC%\bin\lnth* %_DEST%\bin%_EXT%\lnth*
-..\%__SRC%\lib\ilnth* %_DEST%\lib%_EXT%\ilnth*
-..\%__SRC%\lib\liblnth.a %_DEST%\lib%_EXT%\liblnth.a
-..\%__SRC%\lib\liblnth*.dylib %_DEST%\lib%_EXT%\liblnth*.dylib
-..\%__SRC%\lib\liblnth*.so %_DEST%\lib%_EXT%\liblnth*.so
-
-..\%__SRC%\bin\spell* %_DEST%\bin%_EXT%\spell*
-..\%__SRC%\lib\ilspell* %_DEST%\lib%_EXT%\ilspell*
-..\%__SRC%\lib\libspell*.dylib %_DEST%\lib%_EXT%\libspell*.dylib
-..\%__SRC%\lib\libspell*.so %_DEST%\lib%_EXT%\libspell*.so
-
-..\%__SRC%\bin\hunspell* %_DEST%\bin%_EXT%\hunspell*
-..\%__SRC%\lib\ilhunspell* %_DEST%\lib%_EXT%\ilhunspell*
-..\%__SRC%\lib\libhunspell*.dylib %_DEST%\lib%_EXT%\libhunspell*.dylib
-..\%__SRC%\lib\libhunspell*.so %_DEST%\lib%_EXT%\libhunspell*.so
-
-..\%__SRC%\bin\hyph* %_DEST%\bin%_EXT%\hyph*
-..\%__SRC%\lib\ihyph* %_DEST%\lib%_EXT%\ihyph*
-..\%__SRC%\lib\libhnj.* %_DEST%\lib%_EXT%\libhnj.*
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\libhyphen*.so %_DEST%\lib%_EXT%\libhyphen*.so
-
-..\%__SRC%\bin\ulingu* %_DEST%\bin%_EXT%\ulingu*
-..\%__SRC%\lib\ilulingu* %_DEST%\lib%_EXT%\iulingu*
-..\%__SRC%\lib\libulingu.a %_DEST%\lib%_EXT%\libulingu.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-
-..\%__SRC%\bin\guesslan* %_DEST%\bin%_EXT%\guesslan*
-..\%__SRC%\lib\iguesslang* %_DEST%\lib%_EXT%\iguesslang*
-..\%__SRC%\lib\libguesslang*.dylib %_DEST%\lib%_EXT%\libguesslang*.dylib
-..\%__SRC%\lib\libguesslang*.so %_DEST%\lib%_EXT%\libguesslang*.so
-
-..\%__SRC%\lib\libMacOSXSpell*.dylib %_DEST%\lib%_EXT%\libMacOSXSpell*.dylib
-
-
-mkdir: %_DEST%\xml%_EXT%\registry
-mkdir: %_DEST%\xml%_EXT%\registry\data
-mkdir: %_DEST%\xml%_EXT%\registry\data\org
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-..\config\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\*.xcu
-
-..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml%_EXT%\MacOSXSpell.component
-..\%__SRC%\misc\guesslang.component %_DEST%\xml%_EXT%\guesslang.component
-..\%__SRC%\misc\hyphen.component %_DEST%\xml%_EXT%\hyphen.component
-..\%__SRC%\misc\lnth.component %_DEST%\xml%_EXT%\lnth.component
-..\%__SRC%\misc\spell.component %_DEST%\xml%_EXT%\spell.component
diff --git a/lingucomponent/source/lingutil/makefile.mk
b/lingucomponent/prj/makefile.mk
similarity index 52%
rename from lingucomponent/source/lingutil/makefile.mk
rename to lingucomponent/prj/makefile.mk
index 9039252d6922..c62c6a657d16 100644
--- a/lingucomponent/source/lingutil/makefile.mk
+++ b/lingucomponent/prj/makefile.mk
@@ -21,34 +21,24 @@
-PRJ = ..$/..
-
-PRJNAME = lingucomponent
-TARGET = ulingu
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-#----- Settings ---------------------------------------------------------
+PRJ=..
+TARGET=prj
.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_DICTS)" == "YES"
-CXXFLAGS += -DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\"
-DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\"
-DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\"
-CFLAGSCXX += -DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\"
-DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\"
-DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\"
-CFLAGSCC += -DSYSTEM_DICTS -DDICT_SYSTEM_DIR=\"$(DICT_SYSTEM_DIR)\"
-DHYPH_SYSTEM_DIR=\"$(HYPH_SYSTEM_DIR)\"
-DTHES_SYSTEM_DIR=\"$(THES_SYSTEM_DIR)\"
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
.ENDIF
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
-SLOFILES = $(SLO)$/lingutil.obj
-
-LIB1TARGET= $(SLB)$/lib$(TARGET).lib
-LIB1ARCHIV= $(LB)/lib$(TARGET).a
-LIB1OBJFILES= $(SLOFILES)
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET)
$(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
deleted file mode 100644
index a9861e3ffc0c..000000000000
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory
-component_getImplementationEnvironment
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
index cc96a0993fab..a023402f5acc 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hreg.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_hyphen.hxx"
@@ -50,13 +50,13 @@ extern void * SAL_CALL Hyphenator_getFactory(
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = Hyphenator_getFactory(
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
index 097a768e6464..558b19f27fa4 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_hyphen.hxx"
#include <com/sun/star/uno/Reference.h>
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
deleted file mode 100644
index 67f9a4401955..000000000000
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ /dev/null
@@ -1,105 +0,0 @@
-#**************************************************************
-#
-# 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 = ..$/..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = hyphen_lib
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(GUI)"=="OS2"
-HNJLIB=-lhyphen
-.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
-HNJLIB=-lhyphen
-.ELSE
-HNJLIB=hyphen.lib
-.ENDIF
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_HYPHEN)" == "YES"
-
-
-CFLAGS += -I..$/..$/..$/lingutil
-
-EXCEPTIONSFILES= \
- $(SLO)$/hyphenimp.obj
-
-SLOFILES= \
- $(SLO)$/hreg.obj\
- $(SLO)$/hyphenimp.obj
-
-.IF "$(GUI)" == "OS2"
-REALNAME:=hyphen_u
-.ELSE
-REALNAME:=hyphen.uno
-.ENDIF
-SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(I18NISOLANGLIB) \
- $(TOOLSLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB) \
- $(HNJLIB) \
- $(ULINGULIB)
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib $(SLB)$/libulingu.lib
-SHL1IMPLIB= i$(REALNAME)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# build DEF file
-DEF1NAME =$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/hyphen.component
-
-$(MISC)/hyphen.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- hyphen.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt hyphen.component
-
-.ELSE
-all:
- @echo "hyphen disabled"
-
-.ENDIF
diff --git a/lingucomponent/source/languageguessing/altstrfunc.cxx
b/lingucomponent/source/languageguessing/altstrfunc.cxx
index 023682104a71..d0e6a8c0dec5 100644
--- a/lingucomponent/source/languageguessing/altstrfunc.cxx
+++ b/lingucomponent/source/languageguessing/altstrfunc.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_guesslang.hxx"
#include "altstrfunc.hxx"
#include <sal/types.h>
diff --git a/lingucomponent/source/languageguessing/guess.cxx
b/lingucomponent/source/languageguessing/guess.cxx
index c192ed18b132..263f1c50aa79 100644
--- a/lingucomponent/source/languageguessing/guess.cxx
+++ b/lingucomponent/source/languageguessing/guess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_guesslang.hxx"
#include <iostream>
#include <string.h>
diff --git a/lingucomponent/source/languageguessing/guesslang.cxx
b/lingucomponent/source/languageguessing/guesslang.cxx
index f21f5add6df9..34e500b7bd3e 100644
--- a/lingucomponent/source/languageguessing/guesslang.cxx
+++ b/lingucomponent/source/languageguessing/guesslang.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_guesslang.hxx"
#include <iostream>
@@ -455,13 +455,13 @@ static struct ::cppu::ImplementationEntry
s_component_entries [] =
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
sal_Char const ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
sal_Char const * implName, lang::XMultiServiceFactory * xMgr,
registry::XRegistryKey * xRegistry )
{
diff --git a/lingucomponent/source/languageguessing/makefile.mk
b/lingucomponent/source/languageguessing/makefile.mk
deleted file mode 100644
index e7a51e68c76e..000000000000
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ /dev/null
@@ -1,88 +0,0 @@
-#**************************************************************
-#
-# 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=..$/..
-PRJNAME=lingucomponent
-
-.IF "$(GUI)"=="OS2"
-TARGET=guesslan
-.ELSE
-TARGET=guesslang
-.ENDIF
-
-ENABLE_EXCEPTIONS=TRUE
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)$(COM)"=="WNTGCC" ||
"$(GUI)"=="OS2"
-LIBTEXTCATLIB=-ltextcat
-.ELSE # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-LIBTEXTCATLIB=ilibtextcat.lib
-.ENDIF # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
-
-SLOFILES = \
- $(SLO)$/altstrfunc.obj \
- $(SLO)$/guess.obj \
- $(SLO)$/guesslang.obj \
- $(SLO)$/simpleguesser.obj
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPUHELPERLIB) \
- $(CPPULIB) \
- $(LIBTEXTCATLIB) \
- $(SALLIB) \
- $(SVLLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB)
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-.IF "$(OS)"!="MACOSX"
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-.ENDIF
-
-# build DEF file
-DEF1NAME =$(SHL1TARGET)
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/guesslang.component
-
-$(MISC)/guesslang.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- guesslang.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt guesslang.component
diff --git a/lingucomponent/source/languageguessing/simpleguesser.cxx
b/lingucomponent/source/languageguessing/simpleguesser.cxx
index 9308a109c5f9..f6b74ad4ddb1 100644
--- a/lingucomponent/source/languageguessing/simpleguesser.cxx
+++ b/lingucomponent/source/languageguessing/simpleguesser.cxx
@@ -32,7 +32,7 @@
*/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_guesslang.hxx"
#include <string.h>
#include <sstream>
diff --git a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
index ed39918b9917..4be0c8681b1d 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macreg.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_mac.hxx"
#include <cppuhelper/factory.hxx> // helper for factories
@@ -50,13 +50,13 @@ extern void * SAL_CALL MacSpellChecker_getFactory(
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = NULL;
diff --git a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
index 2b5597b37edc..095833a4dffd 100644
--- a/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
+++ b/lingucomponent/source/spellcheck/macosxspell/macspellimp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_mac.hxx"
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
deleted file mode 100644
index eb61c40bb553..000000000000
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ /dev/null
@@ -1,92 +0,0 @@
-#**************************************************************
-#
-# 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 = ..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = MacOSXSpell
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(GUIBASE)"=="aqua"
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-
-# --- Files --------------------------------------------------------
-
-
-CFLAGSCXX+=$(OBJCXXFLAGS)
-CFLAGSCXX+=-I..$/..$/lingutil
-
-EXCEPTIONSFILES= \
- $(SLO)$/macspellimp.obj
-
-
-SLOFILES= \
- $(SLO)$/macreg.obj\
- $(SLO)$/macspellimp.obj
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(VOSLIB) \
- $(TOOLSLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(UCBHELPERLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB)
-
-SHL1STDLIBS+= -framework Cocoa
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-.ELSE
-dummy:
- @echo " Nothing to build for GUIBASE=$(GUIBASE)"
-.ENDIF
-
-ALLTAR : $(MISC)/MacOSXSpell.component
-
-$(MISC)/MacOSXSpell.component .ERRREMOVE : \
- $(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt MacOSXSpell.component
diff --git a/lingucomponent/source/spellcheck/spell/exports.dxp
b/lingucomponent/source/spellcheck/spell/exports.dxp
deleted file mode 100644
index a9861e3ffc0c..000000000000
--- a/lingucomponent/source/spellcheck/spell/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory
-component_getImplementationEnvironment
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk
b/lingucomponent/source/spellcheck/spell/makefile.mk
deleted file mode 100644
index 24baa45d216c..000000000000
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#**************************************************************
-#
-# 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 = ..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = spell
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell
-.ENDIF
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(ENABLE_HUNSPELL)" == "YES"
-
-CXXFLAGS += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
-CFLAGSCXX += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
-CFLAGSCC += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
-
-EXCEPTIONSFILES= \
- $(SLO)$/sspellimp.obj
-
-SLOFILES= \
- $(SLO)$/sreg.obj\
- $(SLO)$/sspellimp.obj
-
-.IF "$(GUI)" == "OS2"
-REALNAME:=$(TARGET)
-.ELSE
-REALNAME:=$(TARGET).uno
-.ENDIF
-SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(I18NISOLANGLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(LNGLIB) \
- $(ULINGULIB) \
- $(ICUUCLIB) \
- $(HUNSPELLLIB)
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib $(SLB)$/libulingu.lib
-SHL1IMPLIB= i$(REALNAME)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-# Hunspell is a static library. Avoid the definition
-# LIBHUNSPELL_DLL_EXPORTED __declspec(dllimport)
-#
-CDEFS+=-DHUNSPELL_STATIC
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# build DEF file
-DEF1NAME =$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/spell.component
-
-$(MISC)/spell.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- spell.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt spell.component
-
-.ELSE
-all:
- @echo "hunspell disabled"
-.ENDIF
diff --git a/lingucomponent/source/spellcheck/spell/sreg.cxx
b/lingucomponent/source/spellcheck/spell/sreg.cxx
index 25077f37c741..ba21e114f99c 100644
--- a/lingucomponent/source/spellcheck/spell/sreg.cxx
+++ b/lingucomponent/source/spellcheck/spell/sreg.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_spell.hxx"
#include <cppuhelper/factory.hxx> // helper for factories
@@ -49,13 +49,13 @@ extern void * SAL_CALL SpellChecker_getFactory(
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = NULL;
diff --git a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
index 84d0e0b16de8..a5f19c5a8814 100644
--- a/lingucomponent/source/spellcheck/spell/sspellimp.cxx
+++ b/lingucomponent/source/spellcheck/spell/sspellimp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_spell.hxx"
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
diff --git a/lingucomponent/source/thesaurus/libnth/exports.dxp
b/lingucomponent/source/thesaurus/libnth/exports.dxp
deleted file mode 100644
index a9861e3ffc0c..000000000000
--- a/lingucomponent/source/thesaurus/libnth/exports.dxp
+++ /dev/null
@@ -1,2 +0,0 @@
-component_getFactory
-component_getImplementationEnvironment
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk
b/lingucomponent/source/thesaurus/libnth/makefile.mk
deleted file mode 100644
index ecadee8b5c64..000000000000
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ /dev/null
@@ -1,107 +0,0 @@
-#**************************************************************
-#
-# 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 = ..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = lnth
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(MYTHESLIB)"==""
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2"
-MYTHESLIB=-lmythes
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-MYTHESLIB=libmythes.lib
-.ENDIF # wnt
-.ENDIF
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_MYTHES)" != "YES"
-CXXFLAGS += -I..$/mythes
-CFLAGSCXX += -I..$/mythes
-CFLAGSCC += -I..$/mythes
-.ENDIF
-CXXFLAGS += -I$(PRJ)$/source$/lingutil
-CFLAGSCXX += -I$(PRJ)$/source$/lingutil
-CFLAGSCC += -I$(PRJ)$/source$/lingutil
-
-EXCEPTIONSFILES= \
- $(SLO)$/nthesimp.obj \
- $(SLO)$/nthesdta.obj
-
-SLOFILES= \
- $(SLO)$/nthesdta.obj\
- $(SLO)$/ntreg.obj\
- $(SLO)$/nthesimp.obj
-
-
-.IF "$(GUI)"=="OS2"
-REALNAME:=$(TARGET)
-.ELSE
-REALNAME:=$(TARGET).uno
-.ENDIF
-SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB) \
- $(ULINGULIB) \
- $(MYTHESLIB)
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib $(SLB)$/libulingu.lib
-SHL1IMPLIB= i$(REALNAME)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-SHL1VERSIONMAP=$(SOLARENV)/src/component.map
-
-# build DEF file
-DEF1NAME =$(SHL1TARGET)
-DEF1EXPORTFILE= exports.dxp
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
-
-
-ALLTAR : $(MISC)/lnth.component
-
-$(MISC)/lnth.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
- lnth.component
- $(XSLTPROC) --nonet --stringparam uri \
- '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
- $(SOLARENV)/bin/createcomponent.xslt lnth.component
diff --git a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
index 33f179538c5a..73d841a10dd7 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesdta.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_lnth.hxx"
#include <com/sun/star/uno/Reference.h>
#include <tools/debug.hxx>
#include <unotools/processfactory.hxx>
diff --git a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
index 204769f48e76..2ee9edc6ac4b 100644
--- a/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
+++ b/lingucomponent/source/thesaurus/libnth/nthesimp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_lnth.hxx"
#include <com/sun/star/uno/Reference.h>
#include <cppuhelper/factory.hxx> // helper for factories
diff --git a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
index 8acb4b57d7ac..2fe84617289d 100644
--- a/lingucomponent/source/thesaurus/libnth/ntreg.cxx
+++ b/lingucomponent/source/thesaurus/libnth/ntreg.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_lingucomponent.hxx"
+#include "precompiled_lnth.hxx"
#include <cppuhelper/factory.hxx> // helper for factories
@@ -49,13 +49,13 @@ extern void * SAL_CALL Thesaurus_getFactory(
extern "C"
{
-void SAL_CALL component_getImplementationEnvironment(
+SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment(
const sal_Char ** ppEnvTypeName, uno_Environment ** /*ppEnv*/ )
{
*ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME;
}
-void * SAL_CALL component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory(
const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
{
void * pRet = Thesaurus_getFactory(
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index cd4836eefd8a..b8d543148c1a 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -88,6 +88,8 @@ my_components = \
component/io/source/TextInputStream/textinstream \
component/io/source/TextOutputStream/textoutstream \
component/javaunohelper/util/juh \
+ component/lingucomponent/source/languageguessing/guesslang \
+ component/lingucomponent/source/thesaurus/libnth/lnth \
component/linguistic/source/lng \
component/oox/util/oox \
component/package/source/xstor/xstor \
@@ -154,10 +156,8 @@ my_components = \
flash \
flat \
frm \
- guesslang \
i18npool \
i18nsearch \
- lnth \
localebe1 \
log \
mailmerge \
@@ -228,11 +228,11 @@ my_components += XSLTFilter.jar \
.END
.IF "$(ENABLE_HYPHEN)" == "YES"
-my_components += hyphen
+my_components +=
component/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen
.END
.IF "$(ENABLE_HUNSPELL)" == "YES"
-my_components += spell
+my_components += component/lingucomponent/source/spellcheck/spell/spell
.END
.IF "$(SYSTEM_LIBWPD)" == "YES"
@@ -315,9 +315,9 @@ my_components += \
component/avmedia/source/macavf/avmediaMacAVF \
component/avmedia/source/quicktime/avmediaQuickTime \
component/fpicker/source/aqua/fps_aqua \
+ component/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell \
macab1 \
- macbe1 \
- MacOSXSpell
+ macbe1
.END
.IF "$(OS)" == "WNT"
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index 41d4bac5776e..f18373948d68 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -571,7 +571,7 @@ endef
# The list of libraries is used as is, ie it is not filtered with
gb_Library_KNOWNLIBS.
#
# An error is signaled, when any of the library names does not look like
-# a base name, ie is prefixed by -l or lib or is folled by .lib or .so.
+# a base name, ie is prefixed by -l or is folled by .lib or .so.
#
# @param target
# @param libraries
@@ -582,7 +582,7 @@ endef
define gb_LinkTarget_add_external_libs
# Make sure that all libraries are given as base names.
-ifneq (,$$(filter -l% lib% %.so %.lib, $(2)))
+ifneq (,$$(filter -l% %.so %.lib, $(2)))
$$(eval $$(call gb_Output_announce,ERROR: Please give only library basenames
to gb_LinkTarget_add_external_libs))
$$(eval $$(call gb_Output_announce,ERROR: (no prefixes -l% or lib%, no
suffixes %.so or %.lib)))
$$(eval $$(call gb_Output_announce,ERROR: libraries given: $(2)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
