i118923 - OS/2 port: new link system now uses unix style.

RepositoryFixes.mk

@@ -167,20 +167,35 @@ endif
 endif
 
 ifeq ($(OS),OS2)
-gb_Library_FILENAMES := $(patsubst comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
+#gb_Library_FILENAMES := $(patsubst basegfx:basegfx%,basegfx:ibasegfx%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst comphelper:comphelper%,comphelper:comphelpgcc3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppu:cppu%,cppu:cppu3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst cppuhelper:cppuhelper%,cppuhelper:cppuh3%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cppunit:icppunit%,cppunit:cppunit%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst cui:iicuc%,cui:icuc%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nisolang1:ii18nisolang1%,i18nisolang1:ii18nisolang%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nisolang1:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst i18nutil:i18nutil%,i18nutil:i18nutilgcc3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst icule:iicule%,icule:icule%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst icuuc:iicuuc%,icuuc:icuuc%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmaccess:jvmaccess%,jvmaccess:jvmaccess3gcc3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst jvmfwk:jvmfwk%,jvmfwk:jvmfwk3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst rdf:rdf%,rdf:librdf%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst tl:itl%,tl:tl%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst sal:sal%,sal:sal3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst salhelper:salhelper%,salhelper:salhelp3%,$(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 sot:sot%,sot:isot%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst svl:isvl%,svl:svl%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst vos3:ivos3%,vos3:ivos%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vcl:ivcl%,vcl:vcl%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst ucbhelper:ucbhelper%,ucbhelper:ucbh4%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst vos3:vos3%,vos3:vos3gcc3%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst xo:ixo%,xo:xo%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xml2:ixml2%,xml2:xml2%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst stl:istl%,stl:stdc++%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst stl:stl%,stl:stdc++%,$(gb_Library_FILENAMES))
 #$(info libnames: $(gb_Library_FILENAMES))
 
 # translate to 8.3 naming

basegfx/prj/d.lst

 ..\%__SRC%\lib\ibasegfx.lib %_DEST%\lib%_EXT%\ibasegfx.lib
+..\%__SRC%\lib\basegfx.lib %_DEST%\lib%_EXT%\basegfx.lib
 ..\%__SRC%\lib\basegfx_s.lib %_DEST%\lib%_EXT%\basegfx_s.lib
 
 ..\%__SRC%\bin\basegfx?????.dll %_DEST%\bin%_EXT%\basegfx?????.dll

basegfx/util/makefile.mk

@@ -48,9 +48,6 @@ LIB1FILES=\
     $(SLB)$/raster.lib
 
 SHL1TARGET= basegfx$(DLLPOSTFIX)
-.IF "$(GUI)" == "OS2"
-SHL1TARGET= bgfx
-.ENDIF
 SHL1IMPLIB= ibasegfx
 
 SHL1STDLIBS=\

basic/prj/d.lst

@@ -7,6 +7,7 @@ mkdir: %COMMON_DEST%\res%_EXT%
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a
 ..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\xsb.lib
+..\%__SRC%\slb\sb.lib %_DEST%\lib%_EXT%\sb.lib
 ..\%__SRC%\srs\classes.srs %_DEST%\res%_EXT%\basic.srs
 ..\%COMMON_OUTDIR%\srs\classes_srs.hid %COMMON_DEST%\res%_EXT%\basic_srs.hid
 ..\%__SRC%\bin\sb?????.dll %_DEST%\bin%_EXT%\sb?????.dll

canvas/prj/d.lst

@@ -7,6 +7,7 @@
 ..\%__SRC%\bin\simpleca*.dll %_DEST%\bin%_EXT%\simpleca*.dll
 ..\%__SRC%\bin\canvasfa*.dll %_DEST%\bin%_EXT%\canvasfa*.dll
 ..\%__SRC%\lib\icanvastools.lib %_DEST%\lib%_EXT%\icanvastools.lib
+..\%__SRC%\lib\canvastools.lib %_DEST%\lib%_EXT%\canvastools.lib
 ..\%__SRC%\lib\libcanvastools*.so %_DEST%\lib%_EXT%\
 ..\%__SRC%\lib\cairocanvas.uno.so %_DEST%\lib%_EXT%\cairocanvas.uno.so
 ..\%__SRC%\lib\vclcanvas.uno.so %_DEST%\lib%_EXT%\vclcanvas.uno.so

chart2/util/makefile.pmk

@@ -28,13 +28,13 @@ ENABLE_EXCEPTIONS=TRUE
 .INCLUDE :  settings.mk
 
 # define macro for (chart-specific) tools library
-.IF "$(COM)" == "MSC" || "$(GUI)" == "OS2"
+.IF "$(COM)" == "MSC"
     CHARTTOOLS= icharttools.lib
 .ELSE
     CHARTTOOLS= -lcharttools$(DLLPOSTFIX)
 .ENDIF
 
-.IF "$(COM)" == "MSC" || "$(GUI)" == "OS2"
+.IF "$(COM)" == "MSC"
     CHARTVIEW= ichartview.lib
 .ELSE
     CHARTVIEW= -lchartview$(DLLPOSTFIX)

codemaker/codemaker.pmk

@@ -29,7 +29,7 @@ STL_OS2_BUILDING=1
 CODEMAKERLIBDEPN=codemaker.lib
 COMMONCPPLIBDEPN=commoncpp.lib
 COMMONJAVALIBDEPN=commonjava.lib
-.IF "$(COM)"=="GCC" && "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC" && ("$(GUI)"=="WNT" || "$(GUI)"=="OS2")
 CODEMAKERLIBST=-lcodemaker
 COMMONCPPLIBST=-lcommoncpp
 COMMONJAVALIBST=-lcommonjava

connectivity/prj/d.lst

@@ -5,6 +5,8 @@
 ..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
 ..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
 ..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
+..\%__SRC%\lib\dbt*.lib %_DEST%\lib%_EXT%\dbt*.lib
+
 ..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\source\drivers\adabas\*.xml %_DEST%\xml%_EXT%\*.xml
 ..\source\drivers\ado\*.xml %_DEST%\xml%_EXT%\*.xml

cppcanvas/prj/d.lst

 ..\%__SRC%\bin\cppcanv*.dll %_DEST%\bin%_EXT%\cppcanv*.dll
 ..\%__SRC%\lib\icppcanvas.lib %_DEST%\lib%_EXT%\icppcanvas.lib
+..\%__SRC%\lib\cppcanvas.lib %_DEST%\lib%_EXT%\cppcanvas.lib
 ..\%__SRC%\lib\lib*.* %_DEST%\lib%_EXT%\lib*.*
 
 mkdir: %_DEST%\inc%_EXT%\cppcanvas

cppu/prj/d.lst

@@ -54,6 +54,7 @@ mkdir: %_DEST%\inc%_EXT%\uno
 ..\inc\cppu\helper\purpenv\Mapping.hxx      %_DEST%\inc%_EXT%\cppu\helper\purpenv\Mapping.hxx
 
 ..\%__SRC%\lib\icppu.lib %_DEST%\lib%_EXT%\icppu.lib
+..\%__SRC%\lib\cppu*.lib %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\cppu* %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\libuno_cppu.*.* %_DEST%\lib%_EXT%\*
 

cppu/source/helper/purpenv/export.mk

@@ -6,7 +6,7 @@ purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
 
 .ELIF "$(GUI)"=="OS2"
 NAMEpurpenv_helper := purpeh$(UDK_MAJOR)
-purpenv_helper_LIB := i$(NAMEpurpenv_helper)
+purpenv_helper_LIB := -l$(NAMEpurpenv_helper)
 
 .ELSE
 NAMEpurpenv_helper := purpenvhelper$(UDK_MAJOR)$(COMID)

cppu/util/makefile.mk

@@ -28,7 +28,7 @@ USE_DEFFILE=TRUE
 ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 
-.IF "$(OS)" != "WNT"
+.IF "$(OS)" != "WNT" && "$(OS)" != "OS2"
 UNIXVERSIONNAMES=UDK
 .ENDIF
 

cppuhelper/prj/d.lst

@@ -62,7 +62,7 @@ mkdir: %_DEST%\inc%_EXT%\cppuhelper
 ..\%__SRC%\lib\libuno_cppuhelper*.*.* %_DEST%\lib%_EXT%\*
 
 ..\%__SRC%\lib\libcppuhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\cppuhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\cppuh*.lib %_DEST%\lib%_EXT%\*
 
 ..\source\unorc %_DEST%\bin%_EXT%\uno.ini
 ..\source\unorc %_DEST%\lib%_EXT%\unorc

cppuhelper/source/makefile.mk

@@ -146,7 +146,6 @@ OBJFILES = $(OBJ)$/findsofficepath.obj
 .IF "$(GUI)" == "WNT"
 SHL1TARGET=$(TARGET)$(UDK_MAJOR)$(COMID)
 .ELIF "$(GUI)" == "OS2"
-SHL1TARGET=cppuh
 SHL1TARGET=cppuh$(UDK_MAJOR)
 .ELSE
 SHL1TARGET=uno_$(TARGET)$(COMID)

dbaccess/prj/d.lst

@@ -31,6 +31,7 @@ mkdir: %_DEST%\inc%_EXT%\dbaccess
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 ..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\*.exe
 ..\%__SRC%\lib\idbu* %_DEST%\lib%_EXT%\idbu*
+..\%__SRC%\lib\db?.lib %_DEST%\lib%_EXT%\db?.lib
 *.xml %_DEST%\xml%_EXT%\*.xml
 
 touch: ..\%__SRC%\misc\dbaccess.hid %_DEST%\bin%_EXT%\dba.hid

dbaccess/source/filter/xml/makefile.mk

@@ -84,10 +84,7 @@ SHL1STDLIBS=\
     $(SO2LIB)			\
     $(SALLIB)
 
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS+= \
-        idba.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
 SHL1STDLIBS+= \
         -ldba$(DLLPOSTFIX)
 .ELSE

desktop/source/deployment/inc/dp_misc.mk

@@ -32,7 +32,7 @@ DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
 DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
 .ENDIF
 .ELIF "$(OS)" == "OS2"
-DEPLOYMENTMISCLIB = ideploymentmisc$(DLLPOSTFIX).lib
+DEPLOYMENTMISCLIB = -ldeplmisc
 .ELSE
 DEPLOYMENTMISCLIB = -ldeploymentmisc$(DLLPOSTFIX)
 .ENDIF

dtrans/util/makefile.mk

@@ -163,7 +163,7 @@ SHL3STDLIBS= \
         $(SALLIB)	\
         $(CPPULIB) 	\
         $(CPPUHELPERLIB) \
-        UClip.lib
+        -lUClip
         
 SHL3IMPLIB=i$(SHL3TARGET) 
 

embeddedobj/source/msole/makefile.mk

@@ -92,7 +92,7 @@ SHL1STDLIBS=\
     $(TOOLSLIB)
     
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(COM)"=="GCC"
 EMBOBJLIB=-lembobj
 .ELSE

filter/prj/d.lst

@@ -4,6 +4,7 @@ mkdir: %COMMON_DEST%\bin%_EXT%\hid
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\imsfilter.lib %_DEST%\lib%_EXT%\imsfilter.lib
+..\%__SRC%\lib\msfilter.lib %_DEST%\lib%_EXT%\msfilter.lib
 ..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
 ..\%__SRC%\class\XSLTFilter\*.jar %_DEST%\bin%_EXT%\*.jar
 ..\%__SRC%\class\XSLTValidate\*.jar %_DEST%\bin%_EXT%\*.jar

forms/util/makefile.mk

@@ -89,10 +89,6 @@ RES1FILELIST=\
 RESLIB1NAME=$(TARGET)
 RESLIB1SRSFILES=$(RES1FILELIST)
 
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS += pthread.lib libz.lib
-.ENDIF
-
 # --- Targets ----------------------------------
 
 .INCLUDE : target.mk

formula/prj/d.lst

@@ -7,6 +7,7 @@ dos: sh -c "if test %OS% = MACOSX; then create-bundle %_DEST%\lib%_EXT%\*.dylib;
 ..\%__SRC%\bin\for*.dll %_DEST%\bin%_EXT%\for*.dll
 ..\%__SRC%\lib\libfor*.so %_DEST%\lib%_EXT%\libfor*.so
 ..\%__SRC%\lib\ifor*.lib %_DEST%\lib%_EXT%\ifor*.lib
+..\%__SRC%\lib\for*.lib %_DEST%\lib%_EXT%\for*.lib
 ..\%__SRC%\lib\libfor*.dylib %_DEST%\lib%_EXT%\libfor*.dylib
 
 # Resources

i18nutil/prj/d.lst

@@ -11,3 +11,4 @@ mkdir: %_DEST%\inc%_EXT%\i18nutil
 ..\%__SRC%\lib\libi18nutil*.so %_DEST%\lib%_EXT%\libi18nutil*.so
 ..\%__SRC%\lib\libi18nutil*.dylib %_DEST%\lib%_EXT%\libi18nutil*.dylib
 ..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\ii18nutil.lib
+..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\i18nutilgcc3.lib

jvmaccess/prj/d.lst

@@ -4,5 +4,6 @@ mkdir: %_DEST%\inc%_EXT%\jvmaccess
 ..\inc\jvmaccess\virtualmachine.hxx %_DEST%\inc%_EXT%\jvmaccess\virtualmachine.hxx
 ..\%__SRC%\bin\jvmacces*.dll %_DEST%\bin%_EXT%\*
 ..\%__SRC%\lib\ijvmaccess.lib %_DEST%\lib%_EXT%\ijvmaccess.lib
+..\%__SRC%\lib\jvmaccess*.lib %_DEST%\lib%_EXT%\jvmaccess*.lib
 ..\%__SRC%\lib\libjvmaccess*.*.* %_DEST%\lib%_EXT%\*
 linklib: libjvmaccess*.*.*

jvmfwk/prj/d.lst

@@ -2,6 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\jvmfwk
 ..\inc\jvmfwk\framework.h %_DEST%\inc%_EXT%\jvmfwk\framework.h
 ..\inc\jvmfwk\vendorplugin.h %_DEST%\inc%_EXT%\jvmfwk\vendorplugin.h
 ..\%__SRC%\lib\ijvmfwk.lib %_DEST%\lib%_EXT%\ijvmfwk.lib
+..\%__SRC%\lib\jvmfwk*.lib %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\libjvmfwk.*.* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\jvmfwk*.dll %_DEST%\bin%_EXT%\*
 ..\%__SRC%\bin\sunjavap*.dll %_DEST%\bin%_EXT%\*

lingucomponent/source/languageguessing/makefile.mk

@@ -34,7 +34,7 @@ ENABLE_EXCEPTIONS=TRUE
 
 # --- Files --------------------------------------------------------
 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 LIBTEXTCATLIB=-ltextcat
 .ELSE               # "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
 LIBTEXTCATLIB=ilibtextcat.lib

lingucomponent/source/thesaurus/libnth/makefile.mk

@@ -29,12 +29,9 @@ ENABLE_EXCEPTIONS=TRUE
 USE_DEFFILE=TRUE
 
 .IF "$(MYTHESLIB)"==""
-.IF "$(GUI)"=="UNX"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="OS2"
 MYTHESLIB=-lmythes
 .ENDIF # unx
-.IF "$(GUI)"=="OS2"
-MYTHESLIB=$(SLB)\libmythes.lib
-.ENDIF # os2
 .IF "$(GUI)"=="WNT"
 MYTHESLIB=libmythes.lib
 .ENDIF # wnt

linguistic/prj/d.lst

 ..\%__SRC%\bin\lng* %_DEST%\bin%_EXT%\lng*
 ..\%__SRC%\lib\ilng* %_DEST%\lib%_EXT%\ilng*
+..\%__SRC%\lib\lng.lib %_DEST%\lib%_EXT%\lng.lib
 ..\%__SRC%\lib\liblng.a %_DEST%\lib%_EXT%\liblng.a
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 ..\%__SRC%\lib\liblng*.so %_DEST%\lib%_EXT%\liblng*.so

oox/prj/d.lst

@@ -16,6 +16,7 @@ mkdir: %_DEST%\inc%_EXT%\oox\xls
 ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so
 ..\%__SRC%\lib\i*.lib %_DEST%\lib%_EXT%\i*.lib
+..\%__SRC%\lib\oox.lib %_DEST%\lib%_EXT%\oox.lib
 ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
 
 ..\%__SRC%\inc\oox\token\tokens.hxx %_DEST%\inc%_EXT%\oox\token\tokens.hxx

registry/prj/d.lst

@@ -4,6 +4,7 @@ mkdir: %_DEST%\inc%_EXT%\registry
 ..\inc\registry\*.hxx %_DEST%\inc%_EXT%\registry\*.hxx
 
 ..\%__SRC%\lib\ireg.lib %_DEST%\lib%_EXT%\ireg.lib
+..\%__SRC%\lib\reg*.lib %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\libreg.*.* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\reg*.dll %_DEST%\bin%_EXT%\reg*.dll
 

reportdesign/util/makefile.mk

@@ -67,10 +67,7 @@ SHL1STDLIBS= \
         $(VOSLIB)				\
         $(SALLIB)
 
-.IF "$(GUI)"=="OS2"
-SHL1STDLIBS+= \
-        idbu.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
 SHL1STDLIBS+= \
         -ldbu$(DLLPOSTFIX)
 .ELSE
@@ -127,11 +124,7 @@ SHL2STDLIBS= \
         $(SO2LIB)				\
         $(I18NISOLANGLIB)		\
         $(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
-        idbu.lib				\
-        i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
 SHL2STDLIBS+= \
         -ldbu$(DLLPOSTFIX) \
         -l$(TARGET)$(DLLPOSTFIX)
@@ -141,11 +134,7 @@ SHL2STDLIBS+= \
         i$(TARGET).lib
 .ENDIF
 
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
-        ifor.lib \
-        iforui.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
 SHL2STDLIBS+= \
         -lfor$(DLLPOSTFIX) \
         -lforui$(DLLPOSTFIX)
@@ -200,10 +189,7 @@ SHL3STDLIBS=\
     $(SOTLIB)			\
     $(SO2LIB)			\
     $(SALLIB)
-.IF "$(GUI)"=="OS2"
-SHL3STDLIBS+= \
-    irpt.lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
 SHL3STDLIBS+= \
         -l$(TARGET)$(DLLPOSTFIX)
 .ELSE

sal/util/makefile.mk

-#**************************************************************
-#  
-#  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.
-#  
-#**************************************************************
-
+#**************************************************************
+#  
+#  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=..
@@ -122,7 +122,7 @@ SHL1STDLIBS+= -z allextract -staticlib=Crun -z defaultextract
 .ENDIF # UNX
 
 .IF "$(GUI)"=="OS2"
-SHL1STDLIBS=mmap pthread
+SHL1STDLIBS=-lmmap -lpthread
 .ENDIF # OS2
 
 # If we compile sal with STLport checking iterators

salhelper/prj/d.lst

@@ -16,6 +16,6 @@ mkdir: %_DEST%\inc%_EXT%\salhelper
 ..\%__SRC%\lib\libuno_salhelper*.*.* %_DEST%\lib%_EXT%\*
 
 ..\%__SRC%\lib\libsalhelper*.a %_DEST%\lib%_EXT%\*
-..\%__SRC%\lib\salhelper*.lib %_DEST%\lib%_EXT%\*
+..\%__SRC%\lib\salhelp*.lib %_DEST%\lib%_EXT%\*
 
 linklib: libuno_salhelper*.*.*

solenv/gbuild/platform/os2.mk

@@ -109,6 +109,7 @@ gb_CXXFLAGS := \
 #
 
 gb_STDLIBS = \
+	icule \
 	z \
 	stdc++ \
 
@@ -326,7 +327,6 @@ $(call gb_Helper_abbreviate_dirs_native,\
 		$(if $(filter Executable,$(TARGETTYPE)),$(gb_Executable_TARGETTYPEFLAGS)) \
 		$(LDFLAGS) \
 		@$${RESPONSEFILE} \
-		-L/@unixroot/usr/lib \
 		$(if $(DLLTARGET), $(DLLDEF8)) \
 		$(NATIVERES) \
 		$(patsubst %.lib,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))) \
@@ -366,11 +366,12 @@ gb_Library_DEFS := -D_DLL
 gb_Library_TARGETTYPEFLAGS := -Zdll
 gb_Library_get_rpath :=
 
-gb_Library_SYSPRE := i
+gb_Library_SYSPRE := 
 gb_Library_PLAINEXT := .lib
 
 gb_Library_PLAINLIBS_NONE += \
 	$(gb_STDLIBS) \
+	icule \
 	ft2lib \
 	dl \
 	freetype \

solenv/inc/libs.mk

@@ -21,7 +21,7 @@
 
 LIBSMKREV!:="$$Revision: 1.134.2.3 $$"
 
-.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.IF ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 #
 #externe libs in plattform.mk
@@ -38,6 +38,11 @@ ICUINLIB=-licuin$(ICU_MAJOR)$(ICU_MINOR)
 ICULELIB=-licule$(ICU_MAJOR)$(ICU_MINOR)
 ICUUCLIB=-licuuc$(ICU_MAJOR)$(ICU_MINOR)
 ICUDATALIB=-licudt$(ICU_MAJOR)$(ICU_MINOR)
+.ELIF "$(GUI)"=="OS2"
+ICUINLIB=-licuin
+ICULELIB=-licule
+ICUUCLIB=-licuuc
+ICUDATALIB=-licudt
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 ICUINLIB=-licui18n
 ICULELIB=-licule
@@ -50,6 +55,8 @@ I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 SALHELPERLIB=-lsalhelper$(UDK_MAJOR)$(COMID)
+.ELIF "$(GUI)"=="OS2"
+SALHELPERLIB=-lsalhelp$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 SALHELPERLIB=-luno_salhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
@@ -63,12 +70,19 @@ TOOLSLIB=-ltl$(DLLPOSTFIX)
 .IF "$(GUI)$(COM)"=="WNTGCC"
 CPPULIB=-lcppu$(UDK_MAJOR)
 CPPUHELPERLIB=-lcppuhelper$(UDK_MAJOR)$(COMID)
+.ELIF "$(GUI)"=="OS2"
+CPPULIB=-lcppu$(UDK_MAJOR)
+CPPUHELPERLIB=-lcppuh$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 CPPULIB=-luno_cppu
 CPPUHELPERLIB=-luno_cppuhelper$(COMID)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 .INCLUDE .IGNORE : ucbhelper/version.mk
+.IF "$(GUI)"=="OS2"
+UCBHELPERLIB=-lucbh$(UCBHELPER_MAJOR)
+.ELSE
 UCBHELPERLIB=-lucbhelper$(UCBHELPER_MAJOR)$(COMID)
+.ENDIF
 .IF "$(SYSTEM_OPENSSL)" == "YES"
 OPENSSLLIB=$(OPENSSL_LIBS)
 OPENSSLLIBST=$(STATIC) $(OPENSSL_LIBS) $(DYNAMIC)
@@ -80,7 +94,7 @@ OPENSSLLIBST=-lssl_static -lcrypto_static
 OPENSSLLIBST=$(STATIC) -lssl -lcrypto $(DYNAMIC)
 .ENDIF          # "$(GUI)$(COM)"=="WNTGCC"
 .ENDIF          # "$(SYSTEM_OPENSSL)" == "YES"
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 REGLIB=-lreg$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 REGLIB=-lreg
@@ -89,7 +103,7 @@ REGLIB=-lreg
 VOSLIB=-lvos$(VOS_MAJOR)$(COMID)
 XMLOFFLIB=-lxo$(DLLPOSTFIX)
 XMLOFFLLIB=-lxol
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 STORELIB=-lstore$(UDK_MAJOR)
 SALLIB=-lsal$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
@@ -100,7 +114,7 @@ SALLIB=-luno_sal
 ODBCLIB=-lodbc$(DLLPOSTFIX)
 ODBCBASELIB=-lodbcbase$(DLLPOSTFIX)
 DBFILELIB=-lfile$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 RMCXTLIB=-lrmcxt$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 RMCXTLIB=-lrmcxt
@@ -251,7 +265,7 @@ ISCLIB=-lsc$(DLLPOSTFIX)
 ISDLIB=-lsd$(DLLPOSTFIX)
 PKGCHKLIB=-lpkgchk$(DLLPOSTFIX)
 HELPLINKERLIB=-lhelplinker$(DLLPOSTFIX)
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 JVMACCESSLIB = -ljvmaccess$(UDK_MAJOR)$(COMID)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMACCESSLIB = -ljvmaccess$(COMID)
@@ -266,7 +280,7 @@ XSLTLIB=$(LIBXSLT_LIBS)
 .ELSE
 XSLTLIB=-lxslt $(LIBXML2LIB)
 .ENDIF
-.IF "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)$(COM)"=="WNTGCC" || "$(GUI)"=="OS2"
 JVMFWKLIB = -ljvmfwk$(UDK_MAJOR)
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 JVMFWKLIB = -ljvmfwk
@@ -330,6 +344,8 @@ HUNSPELLLIB=-lhunspell-1.2
 .ENDIF
 .IF "$(SYSTEM_MYTHES)" == "YES"
 MYTHESLIB=$(MYTHES_LIBS)
+.ELIF "$(GUI)" == "OS2"
+MYTHESLIB=-lmythes
 .ELSE
 MYTHESLIB=-lmythes-1.2
 .ENDIF
@@ -340,7 +356,7 @@ UNOPKGAPPLIB=-lunopkgapp
 TESTLIB=-ltest
 XMLREADERLIB=-lxmlreader
 
-.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.ELSE				# ("$(GUI)"=="UNX" || "$(COM)"=="GCC")
 
 AWTLIB*=jawt.lib
 AVMEDIALIB=iavmedia.lib
@@ -363,11 +379,7 @@ LDAPBERLIB=ldapber.lib
 CPPULIB=icppu.lib
 CPPUHELPERLIB=icppuhelper.lib
 UCBHELPERLIB=iucbhelper.lib
-.IF "$(GUI)"=="OS2"
-OPENSSLLIB=ssl.lib crypto.lib
-.ELSE
 OPENSSLLIB=ssleay32.lib libeay32.lib
-.ENDIF
 ODBCLIB=iodbc.lib
 ODBCBASELIB=iodbcbase.lib
 DBFILELIB=ifile.lib
@@ -473,13 +485,9 @@ FREETYPELIB=freetype.lib
 PKGCHKLIB=ipkgchk.lib
 HELPLINKERLIB=ihelplinker.lib
 JVMACCESSLIB = ijvmaccess.lib
-CPPUNITLIB = icppunit_dll.lib
 XSLTLIB = libxslt.lib $(LIBXML2LIB)
-.IF "$(GUI)"=="OS2"
-REDLANDLIB = raptor.a rasqal.a rdf.a $(LIBXML2LIB) $(OPENSSLLIB) pthread.lib
-.ELSE
+CPPUNITLIB = icppunit_dll.lib
 REDLANDLIB = librdf.lib
-.ENDIF
 
 JVMFWKLIB = ijvmfwk.lib
 
@@ -522,4 +530,4 @@ UNOPKGAPPLIB=iunopkgapp.lib
 TESTLIB=itest.lib
 XMLREADERLIB=ixmlreader.lib
 
-.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC") && "$(GUI)"!="OS2"
+.ENDIF              # ("$(GUI)"=="UNX" || "$(COM)"=="GCC")

store/prj/d.lst

@@ -5,6 +5,7 @@ mkdir: %_DEST%\inc%_EXT%\store
 ..\util\store.xml %_DEST%\xml%_EXT%\store.xml
 
 ..\%__SRC%\lib\istore.lib %_DEST%\lib%_EXT%\istore.lib
+..\%__SRC%\lib\store*.lib %_DEST%\lib%_EXT%\store*.lib
 ..\%__SRC%\lib\libstore.*.* %_DEST%\lib%_EXT%\*
 ..\%__SRC%\bin\sto*.dll %_DEST%\bin%_EXT%\sto*.dll
 

ucb/source/ucp/ftp/makefile.mk

@@ -73,10 +73,6 @@ SHL1STDLIBS=\
     $(UCBHELPERLIB) \
     $(CURLLIB)
 
-.IF "$(GUI)" == "OS2"
-SHL1STDLIBS+=ssl.lib crypto.lib libz.lib
-.ENDIF
-
 SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 SHL1LIBS= \
     $(LIB1TARGET)

unodevtools/unodevtools.pmk

@@ -43,10 +43,10 @@ UNODEVTOOLSLIBDEPN=unodevtools.lib
 CODEMAKERLIBDEPN=codemaker.lib
 COMMONCPPLIBDEPN=commoncpp.lib
 COMMONJAVALIBDEPN=commonjava.lib
-UNODEVTOOLSLIBST=unodevtools.lib
-CODEMAKERLIBST=codemaker.lib
-COMMONCPPLIBST=commoncpp.lib
-COMMONJAVALIBST=commonjava.lib
+UNODEVTOOLSLIBST=-lunodevtools
+CODEMAKERLIBST=-lcodemaker
+COMMONCPPLIBST=-lcommoncpp
+COMMONJAVALIBST=-lcommonjava
 .ELSE
 
 UNODEVTOOLSLIBDEPN=libunodevtools.a

vos/prj/d.lst

@@ -6,6 +6,7 @@ mkdir: %_DEST%\inc%_EXT%\vos
 
 ..\%__SRC%\lib\avos.lib %_DEST%\lib%_EXT%\avos.lib
 ..\%__SRC%\lib\ivos.lib %_DEST%\lib%_EXT%\ivos.lib
+..\%__SRC%\lib\vos*.lib %_DEST%\lib%_EXT%\*
 ..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
 ..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
 ..\%__SRC%\lib\lib*.a %_DEST%\lib%_EXT%

xmlreader/prj/d.lst

@@ -2,6 +2,7 @@ mkdir: %_DEST%\inc%_EXT%\xmlreader
 mkdir: %_DEST%\inc%_EXT%\xmlreader\detail
 ..\%__SRC%\bin\xmlread*.dll %_DEST%\bin%_EXT%\xmlread*.dll
 ..\%__SRC%\lib\ixmlreader.lib %_DEST%\lib%_EXT%\ixmlreader.lib
+..\%__SRC%\lib\xmlreader*.lib %_DEST%\lib%_EXT%\xmlreader*.lib
 ..\%__SRC%\lib\libxmlreader.dylib %_DEST%\lib%_EXT%\libxmlreader.dylib
 ..\%__SRC%\lib\libxmlreader.so %_DEST%\lib%_EXT%\libxmlreader.so
 ..\inc\xmlreader\detail\xmlreaderdllapi.hxx %_DEST%\inc%_EXT%\xmlreader\detail\xmlreaderdllapi.hxx