incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yda...@apache.org
Subject svn commit: r1351686 - in /incubator/ooo/trunk/main: lingucomponent/source/languageguessing/makefile.mk lingucomponent/source/thesaurus/libnth/makefile.mk scp2/source/ooo/file_library_ooo.scp
Date Tue, 19 Jun 2012 12:51:27 GMT
Author: ydario
Date: Tue Jun 19 12:51:26 2012
New Revision: 1351686

URL: http://svn.apache.org/viewvc?rev=1351686&view=rev
Log:
i118923 - OS/2 port: use 8.3 names for lingucomponent libraries.

Modified:
    incubator/ooo/trunk/main/lingucomponent/source/languageguessing/makefile.mk
    incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk
    incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp

Modified: incubator/ooo/trunk/main/lingucomponent/source/languageguessing/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/languageguessing/makefile.mk?rev=1351686&r1=1351685&r2=1351686&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/languageguessing/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/languageguessing/makefile.mk Tue Jun 19
12:51:26 2012
@@ -24,7 +24,11 @@
 PRJ=..$/..
 PRJNAME=lingucomponent
 
+.IF "$(GUI)"=="OS2"
+TARGET=guesslan
+.ELSE
 TARGET=guesslang
+.ENDIF
 
 ENABLE_EXCEPTIONS=TRUE
 

Modified: incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk?rev=1351686&r1=1351685&r2=1351686&view=diff
==============================================================================
--- incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk (original)
+++ incubator/ooo/trunk/main/lingucomponent/source/thesaurus/libnth/makefile.mk Tue Jun 19
12:51:26 2012
@@ -62,7 +62,11 @@ SLOFILES=	\
 		$(SLO)$/nthesimp.obj
 
 
+.IF "$(GUI)"=="OS2"
+REALNAME:=$(TARGET)
+.ELSE
 REALNAME:=$(TARGET).uno
+.ENDIF
 SHL1TARGET= $(REALNAME)$(DLLPOSTFIX)
 
 SHL1STDLIBS= \

Modified: incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp?rev=1351686&r1=1351685&r2=1351686&view=diff
==============================================================================
--- incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp (original)
+++ incubator/ooo/trunk/main/scp2/source/ooo/file_library_ooo.scp Tue Jun 19 12:51:26 2012
@@ -1536,7 +1536,11 @@ SPECIAL_COMPONENT_LIB_FILE(gid_File_Ucpe
 File gid_File_Lib_Lnth
     TXT_FILE_BODY;
     Styles = (PACKED);
+#ifdef OS2
+    Name = LIBNAME(lnth);
+#else
     Name = LIBNAME(lnth.uno);
+#endif
     Dir = SCP2_OOO_BIN_DIR;
 End
 



Mime
View raw message