Date: prev next · Thread: first prev next last
2010 Archives by date, by thread · List index


If the internal hyphen library is used which does not
build a shared object, then link to $(SOLARLIBDIR)/libhyphen.a,
instead of using -lhyphen on UNX + GCC.
Also remove the unneccesary HNJLIB because that is defined in
solenv/inc/lib.mk already.
---
 .../hyphenator/altlinuxhyph/hyphen/makefile.mk     |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk 
b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index f3626c7..5c98b06 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -32,10 +32,8 @@ TARGET       = hyphen_lib
 ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
-.ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
-HNJLIB=-lhyphen
+.IF "$(SYSTEM_HYPH)"=="NO" && ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
+HNJLIB=$(SOLARLIBDIR)/libhyphen.a
 .ELSE
 HNJLIB=hyphen.lib
 .ENDIF
-- 
1.7.3.1


Context


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.