[Libreoffice-commits] core.git: Branch 'aoo/trunk' - lingucomponent/source scp2/source

[Yuri Dario]

 lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk |    6 +++++-
 lingucomponent/source/spellcheck/spell/makefile.mk               |    4 ++++
 scp2/source/calc/makefile.mk                                     |    2 +-
 scp2/source/ooo/file_library_ooo.scp                             |    8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 252a23821c46bc6f80996213b2cc48d8f96dbe6e
Author: Yuri Dario <ydario at apache.org>
Date:   Thu Aug 28 11:34:52 2014 +0000

    #i125501# build fixes for enabling Category B also in OS/2 port.

diff --git a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
index d37cfac9..67f9a44 100644
--- a/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
+++ b/lingucomponent/source/hyphenator/altlinuxhyph/hyphen/makefile.mk
@@ -29,7 +29,7 @@ ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
 .IF "$(GUI)"=="OS2"
-HNJLIB=hyphen.lib
+HNJLIB=-lhyphen
 .ELIF "$(GUI)"=="UNX" || "$(COM)"=="GCC"
 HNJLIB=-lhyphen
 .ELSE
@@ -54,7 +54,11 @@ SLOFILES=	\
         $(SLO)$/hreg.obj\
         $(SLO)$/hyphenimp.obj
 
+.IF "$(GUI)" == "OS2"
+REALNAME:=hyphen_u
+.ELSE
 REALNAME:=hyphen.uno
+.ENDIF
 SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \
diff --git a/lingucomponent/source/spellcheck/spell/makefile.mk b/lingucomponent/source/spellcheck/spell/makefile.mk
index 049733b..24baa45 100644
--- a/lingucomponent/source/spellcheck/spell/makefile.mk
+++ b/lingucomponent/source/spellcheck/spell/makefile.mk
@@ -51,7 +51,11 @@ SLOFILES=	\
         $(SLO)$/sreg.obj\
         $(SLO)$/sspellimp.obj
 
+.IF "$(GUI)" == "OS2"
+REALNAME:=$(TARGET)
+.ELSE
 REALNAME:=$(TARGET).uno
+.ENDIF
 SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \
diff --git a/scp2/source/calc/makefile.mk b/scp2/source/calc/makefile.mk
index 780cc65..72a50ec 100644
--- a/scp2/source/calc/makefile.mk
+++ b/scp2/source/calc/makefile.mk
@@ -36,7 +36,7 @@ TARGETTYPE=CUI
 .IF "$(ENABLE_COINMP)" == "YES"
 SCPDEFS+=-DENABLE_COINMP
 .IF "$(SYSTEM_COINMP)" == "NO"
-.IF "$(GUI)"!="WNT"
+.IF "$(GUI)"!="WNT" && "$(GUI)"!="OS2"
 # For the non-Windows platforms all libraries related to CoinMP have to be
 # added explicitly.
 SCPDEFS+=-DADD_ALL_COINMP_LIBRARIES
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index a80f767..44ceca1 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -1384,7 +1384,11 @@ End
 File gid_File_Lib_Spell
     TXT_FILE_BODY;
     Styles = (PACKED);
+#ifdef OS2
+    Name = LIBNAME(spell);
+#else
     Name = LIBNAME(spell.uno);
+#endif
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif
@@ -1535,7 +1539,11 @@ End
 File gid_File_Lib_Hyph
     TXT_FILE_BODY;
     Styles = (PACKED);
+#ifdef OS2
+    Name = LIBNAME(hyphen_u);
+#else
     Name = LIBNAME(hyphen.uno);
+#endif
     Dir = SCP2_OOO_BIN_DIR;
 End
 #endif