[Libreoffice-commits] .: 6 commits - lingucomponent/inc lingucomponent/Library_guesslang.mk lingucomponent/Library_hyphen.mk lingucomponent/Library_lnth.mk lingucomponent/Library_MacOSXSpell.mk lingucomponent/Library_spell.mk lingucomponent/Makefile lingucomponent/Module_lingucomponent.mk lingucomponent/Package_config.mk lingucomponent/prj lingucomponent/source lingucomponent/StaticLibrary_ulingu.mk Module_tail_build.mk postprocess/packcomponents postprocess/prj RepositoryExternal.mk RepositoryFixes.mk Repository.mk RepositoryModule_ooo.mk solenv/gbuild tail_build/prj
Matus Kukan
mkukan at kemper.freedesktop.org
Tue Dec 13 08:03:18 PST 2011
Module_tail_build.mk | 2
Repository.mk | 6
RepositoryExternal.mk | 69 ++++++
RepositoryFixes.mk | 1
RepositoryModule_ooo.mk | 1
lingucomponent/Library_MacOSXSpell.mk | 64 +++++
lingucomponent/Library_guesslang.mk | 57 +++++
lingucomponent/Library_hyphen.mk | 70 ++++++
lingucomponent/Library_lnth.mk | 72 ++++++
lingucomponent/Library_spell.mk | 66 +++++
lingucomponent/Makefile | 39 +++
lingucomponent/Module_lingucomponent.mk | 40 +++
lingucomponent/Package_config.mk | 34 +++
lingucomponent/StaticLibrary_ulingu.mk | 50 ++++
lingucomponent/inc/makefile.mk | 39 ---
lingucomponent/prj/build.lst | 10
lingucomponent/prj/d.lst | 53 ----
lingucomponent/prj/makefile.mk | 1
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp | 1
lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk | 99 --------
lingucomponent/source/languageguessing/makefile.mk | 95 --------
lingucomponent/source/lingutil/makefile.mk | 63 -----
lingucomponent/source/spellcheck/macosxspell/makefile.mk | 100 --------
lingucomponent/source/spellcheck/spell/exports.dxp | 1
lingucomponent/source/spellcheck/spell/makefile.mk | 95 --------
lingucomponent/source/thesaurus/libnth/exports.dxp | 1
lingucomponent/source/thesaurus/libnth/makefile.mk | 113 ----------
postprocess/packcomponents/makefile.mk | 13 -
postprocess/prj/build.lst | 2
solenv/gbuild/JavaClassSet.mk | 2
tail_build/prj/build.lst | 2
31 files changed, 582 insertions(+), 679 deletions(-)
New commits:
commit ab96f8a753dc63d47cd7aceed6a41390c63bacdc
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Fri Dec 9 15:27:03 2011 +0100
remove old comment
diff --git a/solenv/gbuild/JavaClassSet.mk b/solenv/gbuild/JavaClassSet.mk
index 16d914a..4c8d7cf 100644
--- a/solenv/gbuild/JavaClassSet.mk
+++ b/solenv/gbuild/JavaClassSet.mk
@@ -60,8 +60,6 @@ $(call gb_JavaClassSet_get_clean_target,%) :
$(call gb_Helper_abbreviate_dirs,\
rm -rf $(dir $(call gb_JavaClassSet_get_target,$*)))
-# UGLY: cannot use target local variable for REPO because it's needed in prereq
-# No idea what above comment means, and whether still relevant
define gb_JavaClassSet_JavaClassSet
$(call gb_JavaClassSet_get_target,$(1)) : JARDEPS :=
endef
commit 5df936eb38033d3fe071a64223c608206cf9613b
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Dec 4 12:57:49 2011 +0100
add linguistic to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index 850ce33..9b0dc4c 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -39,6 +39,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
formula \
hwpfilter \
lingucomponent \
+ linguistic \
lotuswordpro \
MathMLDTD \
Mesa \
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index abf0ed3..19d0cc5 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess linguistic offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen ICU:icu DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit f51ae7bbf948f68263f2699f68ecba085fd2be74
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sun Dec 4 12:54:01 2011 +0100
add lingucomponent to tail_build
diff --git a/Module_tail_build.mk b/Module_tail_build.mk
index dd320a8..850ce33 100644
--- a/Module_tail_build.mk
+++ b/Module_tail_build.mk
@@ -38,6 +38,7 @@ $(eval $(call gb_Module_add_moduledirs,tail_end,\
forms \
formula \
hwpfilter \
+ lingucomponent \
lotuswordpro \
MathMLDTD \
Mesa \
diff --git a/postprocess/prj/build.lst b/postprocess/prj/build.lst
index 820675c..50f4f60 100644
--- a/postprocess/prj/build.lst
+++ b/postprocess/prj/build.lst
@@ -1,4 +1,4 @@
-po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg lingucomponent ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
+po postprocess :: accessibility BINFILTER:binfilter configmgr CRASHREP:crashrep CT2N:ct2n dtrans embeddedobj embedserv EPM:epm DESKTOP:extensions extras DESKTOP:fpicker HELP:helpcontent2 io LIBRSVG:librsvg ODK:odk officecfg psprint_config remotebridges scaddins scp2 DESKTOP:setup_native sysui testtools ucb UnoControls ure wizards MORE_FONTS:more_fonts DICTIONARIES:dictionaries PYUNO:pyuno readlicense_oo DESKTOP:unodevtools JFREEREPORT:jfreereport REPORTBUILDER:reportbuilder LANGUAGETOOL:languagetool SDEXT:sdext MYSQLC:mysqlc NLPSOLVER:nlpsolver STLPORT:stlport LIBXSLT:libxslt smoketest tail_build NULL
po postprocess usr1 - all po_mkout NULL
po postprocess\checkxml nmake - all po_checkxml NULL
po postprocess\packconfig nmake - all po_packconfig po_checkxml NULL
diff --git a/tail_build/prj/build.lst b/tail_build/prj/build.lst
index ade021f..abf0ed3 100644
--- a/tail_build/prj/build.lst
+++ b/tail_build/prj/build.lst
@@ -1,2 +1,2 @@
-tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost DESKTOP:l10ntools LIBCDR:libcdr LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
+tb tail_build : APACHE_COMMONS:apache-commons BSH:beanshell BERKELEYDB:berkeleydb BOOST:boost HUNSPELL:hunspell HYPHEN:hyphen DESKTOP:l10ntools LIBCDR:libcdr LIBEXTTEXTCAT:libexttextcat LIBXML2:libxml2 LIBXMLSEC:libxmlsec LIBXSLT:libxslt LIBWPG:libwpg LIBWPS:libwps LIBWPD:libwpd LIBVISIO:libvisio LPSOLVE:lpsolve MDDS:mdds MYTHES:mythes NEON:neon NSS:nss OPENSSL:openssl PYTHON:python REDLAND:redland SAXON:saxon TRANSLATIONS:translations XPDF:xpdf avmedia basegfx basic bridges canvas comphelper configmgr connectivity cppcanvas cppu cppuhelper DESKTOP:fpicker javaunohelper jurt jvmaccess linguistic offapi officecfg oovbaapi qadevOOo DESKTOP:rdbmaker readlicense_oo rhino ridljar sal sax sfx2 solenv soltools sot stoc svl svtools svx sysui test toolkit tools ucbhelper udkapi unoil unotools ure vcl xmlhelp xmloff xmlscript xsltml NULL
tb tail_build\prj nmake - all tb_prj NULL
commit f9fc46c1ef035516287d09ddca86e1668a79c701
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Tue Nov 29 20:59:44 2011 +0100
convert lingucomponent to gbuild
diff --git a/Repository.mk b/Repository.mk
index 2cc3544..d2b5c49 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -152,8 +152,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwk \
fwl \
fwm \
+ guesslang \
helplinker \
hwp \
+ hyphen \
i18npaper \
i18nregexp \
icd \
@@ -169,7 +171,9 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
itg \
iti \
lng \
+ lnth \
lwpft \
+ MacOSXSpell \
merged \
msfilter \
msword \
@@ -203,6 +207,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
solver \
sot \
spa \
+ spell \
spl \
sts \
svgfilter \
@@ -372,6 +377,7 @@ $(eval $(call gb_Helper_register_static_libraries,PLAINLIBS, \
ooopathutils \
sample \
salcpprt \
+ ulingu \
vclmain \
writerperfect \
))
diff --git a/RepositoryModule_ooo.mk b/RepositoryModule_ooo.mk
index f59b2e0..fb97d84 100644
--- a/RepositoryModule_ooo.mk
+++ b/RepositoryModule_ooo.mk
@@ -55,6 +55,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
i18npool \
i18nutil \
idl \
+ lingucomponent \
linguistic \
lotuswordpro \
MathMLDTD \
diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
new file mode 100644
index 0000000..ee34290
--- /dev/null
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -0,0 +1,64 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,MacOSXSpell))
+
+$(eval $(call gb_Library_set_componentfile,MacOSXSpell,lingucomponent/source/spellcheck/macosxspell/MacOSXSpell))
+
+$(eval $(call gb_Library_set_include,MacOSXSpell,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/lingucomponent/source/lingutil) \
+))
+
+$(eval $(call gb_Library_add_api,MacOSXSpell,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,MacOSXSpell,\
+ $(gb_STDLIBS) \
+ cppu \
+ cppuhelper \
+ lng \
+ sal \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+))
+
+$(eval $(call gb_Library_use_externals,MacOSXSpell,\
+ cocoa \
+ hunspell \
+))
+
+$(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 0000000..28727ba
--- /dev/null
+++ b/lingucomponent/Library_guesslang.mk
@@ -0,0 +1,57 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,guesslang))
+
+$(eval $(call gb_Library_set_componentfile,guesslang,lingucomponent/source/languageguessing/guesslang))
+
+$(eval $(call gb_Library_add_api,guesslang,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,guesslang,\
+ $(gb_STDLIBS) \
+ cppu \
+ cppuhelper \
+ sal \
+ tl \
+ utl \
+))
+
+$(eval $(call gb_Library_use_externals,guesslang,\
+ libexttextcat \
+))
+
+$(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.mk b/lingucomponent/Library_hyphen.mk
new file mode 100644
index 0000000..b75e6c2
--- /dev/null
+++ b/lingucomponent/Library_hyphen.mk
@@ -0,0 +1,70 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,hyphen))
+
+$(eval $(call gb_Library_set_componentfile,hyphen,lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen))
+
+$(eval $(call gb_Library_set_include,hyphen,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/lingucomponent/source/lingutil) \
+))
+
+$(eval $(call gb_Library_add_api,hyphen,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hyphen,\
+ $(gb_STDLIBS) \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ lng \
+ sal \
+ tl \
+ utl \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,hyphen,\
+ ulingu \
+))
+
+$(eval $(call gb_Library_use_externals,hyphen,\
+ hunspell \
+))
+
+$(eval $(call gb_Library_add_libs,hyphen,\
+ $(if $(filter MSC,$(COM)),hyphen.lib,-lhyphen) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,hyphen,\
+ 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 0000000..e659dbf
--- /dev/null
+++ b/lingucomponent/Library_lnth.mk
@@ -0,0 +1,72 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,lnth))
+
+$(eval $(call gb_Library_set_componentfile,lnth,lingucomponent/source/thesaurus/libnth/lnth))
+
+$(eval $(call gb_Library_set_include,lnth,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/lingucomponent/source/lingutil) \
+))
+
+$(eval $(call gb_Library_add_api,lnth,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,lnth,\
+ $(gb_STDLIBS) \
+ comphelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ lng \
+ sal \
+ tl \
+ utl \
+))
+
+$(eval $(call gb_Library_add_linked_static_libs,lnth,\
+ ulingu \
+))
+
+$(eval $(call gb_Library_use_externals,lnth,\
+ hunspell \
+))
+
+$(eval $(call gb_Library_add_libs,lnth,\
+ $(if $(filter MSC,$(COM)),libmythes.lib,-lmythes-1.2) \
+))
+
+$(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 0000000..a66b4ba
--- /dev/null
+++ b/lingucomponent/Library_spell.mk
@@ -0,0 +1,66 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Library_Library,spell))
+
+$(eval $(call gb_Library_set_componentfile,spell,lingucomponent/source/spellcheck/spell/spell))
+
+$(eval $(call gb_Library_set_include,spell,\
+ $$(INCLUDE) \
+ -I$(realpath $(SRCDIR)/lingucomponent/source/lingutil) \
+))
+
+$(eval $(call gb_Library_add_api,spell,\
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,spell,\
+ $(gb_STDLIBS) \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ lng \
+ sal \
+ tl \
+ utl \
+))
+
+$(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 0000000..44c7d7c
--- /dev/null
+++ b/lingucomponent/Makefile
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org. If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+gb_PARTIALBUILD := T
+ifeq ($(strip $(SOLARENV)),)
+include $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/../solenv/gbuild/source_and_rerun.mk
+else
+
+include $(SOLARENV)/gbuild/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk
new file mode 100644
index 0000000..43f4a1a
--- /dev/null
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -0,0 +1,40 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Module_Module,lingucomponent))
+
+$(eval $(call gb_Module_add_targets,lingucomponent,\
+ Library_guesslang \
+ Library_hyphen \
+ Library_lnth \
+ $(if $(filter aqua,$(GUIBASE)),Library_MacOSXSpell) \
+ Library_spell \
+ Package_config \
+ StaticLibrary_ulingu \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/Package_config.mk b/lingucomponent/Package_config.mk
new file mode 100644
index 0000000..64131f4
--- /dev/null
+++ b/lingucomponent/Package_config.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,lingucomponent_config,$(SRCDIR)/lingucomponent/config))
+
+$(eval $(call gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-hyphenator.xcu,Linguistic-lingucomponent-hyphenator.xcu))
+$(eval $(call gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-spellchecker.xcu,Linguistic-lingucomponent-spellchecker.xcu))
+$(eval $(call gb_Package_add_file,lingucomponent_config,xml/registry/data/org/openoffice/Office/Linguistic-lingucomponent-thesaurus.xcu,Linguistic-lingucomponent-thesaurus.xcu))
+
+# vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/StaticLibrary_ulingu.mk b/lingucomponent/StaticLibrary_ulingu.mk
new file mode 100644
index 0000000..b18b355
--- /dev/null
+++ b/lingucomponent/StaticLibrary_ulingu.mk
@@ -0,0 +1,50 @@
+# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*-
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2011 Matúš Kukan <matus.kukan at gmail.com> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_StaticLibrary_StaticLibrary,ulingu))
+
+$(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_use_externals,ulingu,\
+ hunspell \
+))
+
+$(eval $(call gb_StaticLibrary_add_exception_objects,ulingu,\
+ lingucomponent/source/lingutil/lingutil \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/lingucomponent/inc/makefile.mk b/lingucomponent/inc/makefile.mk
deleted file mode 100644
index ca92f6c..0000000
--- a/lingucomponent/inc/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-PRJ=..
-
-PRJNAME=lingucomponent
-TARGET=inc
-
-# --- Settings -----------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-# --- Targets -------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/lingucomponent/prj/build.lst b/lingucomponent/prj/build.lst
index 07c9718..a29328f 100644
--- a/lingucomponent/prj/build.lst
+++ b/lingucomponent/prj/build.lst
@@ -1,10 +1,2 @@
lc lingucomponent : linguistic LIBEXTTEXTCAT:libexttextcat 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 6901350..e69de29 100644
--- a/lingucomponent/prj/d.lst
+++ b/lingucomponent/prj/d.lst
@@ -1,53 +0,0 @@
-..\%__SRC%\bin\*.dat %_DEST%\bin\*.dat
-..\%__SRC%\bin\*.idx %_DEST%\bin\*.idx
-..\%__SRC%\bin\*.aff %_DEST%\bin\*.aff
-..\%__SRC%\bin\*.dic %_DEST%\bin\*.dic
-..\%__SRC%\bin\*.lst %_DEST%\bin\*.lst
-
-..\%__SRC%\bin\lnth* %_DEST%\bin\lnth*
-..\%__SRC%\lib\ilnth* %_DEST%\lib\ilnth*
-..\%__SRC%\lib\liblnth.a %_DEST%\lib\liblnth.a
-..\%__SRC%\lib\liblnth*.dylib %_DEST%\lib\liblnth*.dylib
-..\%__SRC%\lib\liblnth*.so %_DEST%\lib\liblnth*.so
-
-..\%__SRC%\bin\spell* %_DEST%\bin\spell*
-..\%__SRC%\lib\ilspell* %_DEST%\lib\ilspell*
-..\%__SRC%\lib\libspell*.dylib %_DEST%\lib\libspell*.dylib
-..\%__SRC%\lib\libspell*.so %_DEST%\lib\libspell*.so
-
-..\%__SRC%\bin\hunspell* %_DEST%\bin\hunspell*
-..\%__SRC%\lib\ilhunspell* %_DEST%\lib\ilhunspell*
-..\%__SRC%\lib\libhunspell*.dylib %_DEST%\lib\libhunspell*.dylib
-..\%__SRC%\lib\libhunspell*.so %_DEST%\lib\libhunspell*.so
-
-..\%__SRC%\bin\hyph* %_DEST%\bin\hyph*
-..\%__SRC%\lib\ihyph* %_DEST%\lib\ihyph*
-..\%__SRC%\lib\libhnj.* %_DEST%\lib\libhnj.*
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-..\%__SRC%\lib\libhyphen*.so %_DEST%\lib\libhyphen*.so
-
-..\%__SRC%\bin\ulingu* %_DEST%\bin\ulingu*
-..\%__SRC%\lib\ilulingu* %_DEST%\lib\iulingu*
-..\%__SRC%\lib\libulingu.a %_DEST%\lib\libulingu.a
-..\%__SRC%\lib\*.dylib %_DEST%\lib\*.dylib
-
-..\%__SRC%\bin\guesslan* %_DEST%\bin\guesslan*
-..\%__SRC%\lib\iguesslang* %_DEST%\lib\iguesslang*
-..\%__SRC%\lib\libguesslang*.dylib %_DEST%\lib\libguesslang*.dylib
-..\%__SRC%\lib\libguesslang*.so %_DEST%\lib\libguesslang*.so
-
-..\%__SRC%\lib\libMacOSXSpell*.dylib %_DEST%\lib\libMacOSXSpell*.dylib
-
-
-mkdir: %_DEST%\xml\registry
-mkdir: %_DEST%\xml\registry\data
-mkdir: %_DEST%\xml\registry\data\org
-mkdir: %_DEST%\xml\registry\data\org\openoffice
-mkdir: %_DEST%\xml\registry\data\org\openoffice\Office
-..\config\*.xcu %_DEST%\xml\registry\data\org\openoffice\Office\*.xcu
-
-..\%__SRC%\misc\MacOSXSpell.component %_DEST%\xml\MacOSXSpell.component
-..\%__SRC%\misc\guesslang.component %_DEST%\xml\guesslang.component
-..\%__SRC%\misc\hyphen.component %_DEST%\xml\hyphen.component
-..\%__SRC%\misc\lnth.component %_DEST%\xml\lnth.component
-..\%__SRC%\misc\spell.component %_DEST%\xml\spell.component
diff --git a/lingucomponent/prj/makefile.mk b/lingucomponent/prj/makefile.mk
new file mode 100644
index 0000000..0997622
--- /dev/null
+++ b/lingucomponent/prj/makefile.mk
@@ -0,0 +1 @@
+.INCLUDE : gbuildbridge.mk
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
deleted file mode 100644
index 7003307..0000000
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
deleted file mode 100644
index c09723d..0000000
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ /dev/null
@@ -1,99 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = hyphen_lib
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
-HNJLIB=-lhyphen
-.ELSE
-HNJLIB=hyphen.lib
-.ENDIF
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell -DHUNSPELL_STATIC
-.ENDIF
-
-CFLAGS += -I..$/..$/..$/lingutil $(HUNSPELL_CFLAGS)
-
-EXCEPTIONSFILES= \
- $(SLO)$/hyphenimp.obj
-
-SLOFILES= \
- $(SLO)$/hreg.obj\
- $(SLO)$/hyphenimp.obj
-
-REALNAME:=hyphen
-SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(I18NISOLANGLIB) \
- $(TOOLSLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB) \
- $(HNJLIB) \
- $(ULINGULIB) \
- $(HUNSPELLLIB)
-
-# 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
diff --git a/lingucomponent/source/languageguessing/makefile.mk b/lingucomponent/source/languageguessing/makefile.mk
deleted file mode 100644
index 65036db..0000000
--- a/lingucomponent/source/languageguessing/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-PRJNAME=lingucomponent
-
-TARGET=guesslang
-
-ENABLE_EXCEPTIONS=TRUE
-VISIBILITY_HIDDEN=TRUE
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(GUI)"=="UNX"
-.IF "$(SYSTEM_LIBEXTTEXTCAT)" == "YES"
-LIBTEXTCATLIB=$(LIBEXTTEXTCAT_LIBS)
-.ELSE
-LIBTEXTCATLIB=-lexttextcat
-.ENDIF
-.ELSE # "$(GUI)"=="UNX"
-.IF "$(COM)"=="GCC"
-LIBTEXTCATLIB=-lilibexttextcat
-.ELSE
-LIBTEXTCATLIB=ilibexttextcat.lib
-.ENDIF
-.ENDIF # "$(GUI)"=="UNX"
-
-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
-SHL1USE_EXPORTS = name
-SHL1LIBS= $(SLB)$/$(TARGET).lib
-SHL1IMPLIB= i$(TARGET)
-SHL1DEPN= $(SHL1LIBS)
-SHL1DEF= $(MISC)$/$(SHL1TARGET).def
-
-# 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/lingutil/makefile.mk b/lingucomponent/source/lingutil/makefile.mk
deleted file mode 100644
index 87df6ae..0000000
--- a/lingucomponent/source/lingutil/makefile.mk
+++ /dev/null
@@ -1,63 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..
-
-PRJNAME = lingucomponent
-TARGET = ulingu
-LIBTARGET=NO
-
-ENABLE_EXCEPTIONS=TRUE
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell -DHUNSPELL_STATIC
-.ENDIF
-
-.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)\"
-.ENDIF
-
-CXXFLAGS += $(HUNSPELL_CFLAGS)
-CFLAGSCXX += $(HUNSPELL_CFLAGS)
-CFLAGSCC += $(HUNSPELL_CFLAGS)
-
-SLOFILES = $(SLO)$/lingutil.obj
-
-LIB1TARGET= $(SLB)$/lib$(TARGET).lib
-LIB1ARCHIV= $(LB)/lib$(TARGET).a
-LIB1OBJFILES= $(SLOFILES)
-
-
-# --- Targets ------------------------------------------------------
-
-.INCLUDE : target.mk
diff --git a/lingucomponent/source/spellcheck/macosxspell/makefile.mk b/lingucomponent/source/spellcheck/macosxspell/makefile.mk
deleted file mode 100644
index 0a724f0..0000000
--- a/lingucomponent/source/spellcheck/macosxspell/makefile.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = MacOSXSpell
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(GUIBASE)"=="aqua"
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell -DHUNSPELL_STATIC
-.ENDIF
-
-CXXFLAGS += $(HUNSPELL_CFLAGS)
-CFLAGSCXX += $(HUNSPELL_CFLAGS)
-CFLAGSCC += $(HUNSPELL_CFLAGS)
-
-# --- Files --------------------------------------------------------
-
-CFLAGSCXX+=$(OBJCXXFLAGS)
-CFLAGSCXX+=-I..$/..$/lingutil
-
-EXCEPTIONSFILES= \
- $(SLO)$/macspellimp.obj
-
-
-SLOFILES= \
- $(SLO)$/macreg.obj\
- $(SLO)$/macspellimp.obj
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(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 7003307..0000000
--- a/lingucomponent/source/spellcheck/spell/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
deleted file mode 100644
index 81a683c..0000000
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ /dev/null
@@ -1,95 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = spell
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell -DHUNSPELL_STATIC
-.ENDIF
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-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
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(I18NISOLANGLIB) \
- $(TOOLSLIB) \
- $(UNOTOOLSLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(LNGLIB) \
- $(ULINGULIB) \
- $(ICUUCLIB) \
- $(HUNSPELLLIB)
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib $(SLB)$/libulingu.lib
-SHL1IMPLIB= i$(TARGET)
-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)/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
diff --git a/lingucomponent/source/thesaurus/libnth/exports.dxp b/lingucomponent/source/thesaurus/libnth/exports.dxp
deleted file mode 100644
index 7003307..0000000
--- a/lingucomponent/source/thesaurus/libnth/exports.dxp
+++ /dev/null
@@ -1 +0,0 @@
-component_getFactory
diff --git a/lingucomponent/source/thesaurus/libnth/makefile.mk b/lingucomponent/source/thesaurus/libnth/makefile.mk
deleted file mode 100644
index 068e71a..0000000
--- a/lingucomponent/source/thesaurus/libnth/makefile.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ = ..$/..$/..
-
-PRJNAME = lingucomponent
-TARGET = lnth
-ENABLE_EXCEPTIONS=TRUE
-USE_DEFFILE=TRUE
-
-
-.IF "$(MYTHESLIB)"==""
-.IF "$(GUI)"=="UNX"
-MYTHESLIB=-lmythes
-.ENDIF # unx
-.IF "$(GUI)"=="WNT"
-MYTHESLIB=libmythes.lib
-.ENDIF # wnt
-.ENDIF
-
-#----- Settings ---------------------------------------------------------
-
-.INCLUDE : settings.mk
-
-# --- Files --------------------------------------------------------
-
-.IF "$(SYSTEM_HUNSPELL)" != "YES"
-HUNSPELL_CFLAGS += -I$(SOLARINCDIR)$/hunspell -DHUNSPELL_STATIC
-.ENDIF
-
-.IF "$(SYSTEM_MYTHES)" != "YES"
-CXXFLAGS += -I..$/mythes
-CFLAGSCXX += -I..$/mythes
-CFLAGSCC += -I..$/mythes
-.ENDIF
-CXXFLAGS += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
-CFLAGSCXX += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
-CFLAGSCC += -I$(PRJ)$/source$/lingutil $(HUNSPELL_CFLAGS)
-
-EXCEPTIONSFILES= \
- $(SLO)$/nthesimp.obj \
- $(SLO)$/nthesdta.obj
-
-SLOFILES= \
- $(SLO)$/nthesdta.obj\
- $(SLO)$/ntreg.obj\
- $(SLO)$/nthesimp.obj
-
-
-SHL1TARGET= $(TARGET)$(DLLPOSTFIX)
-
-SHL1STDLIBS= \
- $(COMPHELPERLIB) \
- $(CPPULIB) \
- $(CPPUHELPERLIB) \
- $(TOOLSLIB) \
- $(I18NISOLANGLIB) \
- $(SVLLIB) \
- $(SALLIB) \
- $(UNOTOOLSLIB) \
- $(LNGLIB) \
- $(ULINGULIB) \
- $(MYTHESLIB) \
- $(HUNSPELLLIB)
-
-# build DLL
-SHL1LIBS= $(SLB)$/$(TARGET).lib $(SLB)$/libulingu.lib
-SHL1IMPLIB= i$(TARGET)
-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/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index cf5f1bf..850d2c2 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -76,6 +76,10 @@ my_components = \
component/hwpfilter/source/hwp \
component/i18npool/source/search/i18nsearch \
component/i18npool/util/i18npool \
+ component/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphen \
+ component/lingucomponent/source/languageguessing/guesslang \
+ component/lingucomponent/source/spellcheck/spell/spell \
+ component/lingucomponent/source/thesaurus/libnth/lnth \
component/linguistic/source/lng \
component/lotuswordpro/util/lwpfilter \
component/oox/util/oox \
@@ -144,14 +148,10 @@ my_components = \
dbtools \
embobj \
flat \
- guesslang \
- hyphen \
- lnth \
localebe1 \
mysql \
odbc \
sdbc2 \
- spell \
srtrs1 \
ucb1 \
ucpexpand1 \
@@ -285,7 +285,6 @@ my_components += component/xmlsecurity/util/xsec_xmlsec
.IF "$(OS)" == "MACOSX"
my_components += \
- MacOSXSpell \
fps_aqua \
macab1 \
macbe1 \
@@ -293,7 +292,9 @@ my_components += \
.END
.IF "$(GUIBASE)" == "aqua"
-my_components += component/avmedia/source/quicktime/avmediaQuickTime
+my_components += \
+ component/avmedia/source/quicktime/avmediaQuickTime \
+ component/lingucomponent/source/spellcheck/macosxspell/MacOSXSpell
.END
.IF "$(OS)" == "WNT"
commit bd030305b844f451910d671c894d5e8fa8d532b7
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Dec 3 15:06:52 2011 +0100
add libexttextcat to external libs
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 264cc11..11896cd 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -209,6 +209,45 @@ endef
endif # SYSTEM_HUNSPELL
+ifeq ($(SYSTEM_LIBEXTTEXTCAT),YES)
+
+define gb_LinkTarget__use_libexttextcat
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ $(LIBEXTTEXTCAT_CFLAGS) \
+)
+$(call gb_LinkTarget_add_libs,$(1),$(LIBEXTTEXTCAT_LIBS))
+
+endef
+
+else # !SYSTEM_LIBEXTTEXTCAT
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO,\
+ exttextcat \
+))
+else
+$(eval $(call gb_Helper_register_static_libraries,PLAINLIBS,\
+ exttextcat \
+))
+endif
+
+define gb_LinkTarget__use_libexttextcat
+ifeq ($(OS),WNT)
+$(call gb_LinkTarget_add_linked_libs,$(1),\
+ exttextcat \
+)
+else
+$(call gb_LinkTarget_add_linked_static_libs,$(1),\
+ exttextcat \
+)
+endif
+
+endef
+
+endif # SYSTEM_LIBEXTTEXTCAT
+
+
ifeq ($(SYSTEM_LIBXML),YES)
define gb_LinkTarget__use_libxml2
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 6b2d230..59dd09d 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -49,6 +49,7 @@ gb_Library_DLLFILENAMES := $(patsubst ucb:libucb%,ucb:libucb1%,$(gb_Library_DLLF
gb_Library_DLLFILENAMES := $(patsubst ucpfile:libucpfile%,ucpfile:libucpfile1%,$(gb_Library_DLLFILENAMES))
gb_Library_DLLFILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_DLLFILENAMES))
+gb_Library_FILENAMES := $(patsubst exttextcat:libexttextcat%,exttextcat:libilibexttextcat%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
commit b6bb9bd1e83b40f14f74f3dcf345c7480ac64c46
Author: Matúš Kukan <matus.kukan at gmail.com>
Date: Sat Dec 3 14:44:12 2011 +0100
add hunspell to external libs
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 6be5a13..264cc11 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -179,6 +179,36 @@ $(call gb_LinkTarget__use_expat,$(1),expat_xmlparse)
endef
+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
+
+define gb_LinkTarget__use_hunspell
+$(call gb_LinkTarget_add_defs,$(1),\
+ -DHUNSPELL_STATIC \
+)
+$(call gb_LinkTarget_set_include,$(1),\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc/hunspell \
+)
+$(call gb_LinkTarget_add_libs,$(1),\
+ $(if $(filter WNT,$(OS)),libhunspell.lib,-lhunspell-1.3) \
+)
+
+endef
+
+endif # SYSTEM_HUNSPELL
+
+
ifeq ($(SYSTEM_LIBXML),YES)
define gb_LinkTarget__use_libxml2
More information about the Libreoffice-commits
mailing list