i118923 - OS/2 port: use of gcc style import libraries.

14 files changed, 29 insertions, 35 deletions

diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 35985a274a8f..abbd70c51299 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -173,14 +173,12 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:cppuhelper%,cppuhelper:cppuh3%,$(g
 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:i18nisolang1%,i18nisolang1:i18nisolang1gcc3%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst i18nutil:i18nutil%,i18nutil:i18nutilgcc3%,$(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:sb%,sb:basic%,$(gb_Library_FILENAMES))
 gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(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))
diff --git a/basic/prj/d.lst b/basic/prj/d.lst
index 1bd567aa6541..798c0dae4d64 100644
--- a/basic/prj/d.lst
+++ b/basic/prj/d.lst
@@ -16,6 +16,7 @@ mkdir: %COMMON_DEST%\res%_EXT%
 ..\%__SRC%\bin\sb*.res %_DEST%\bin%_EXT%\sb*.res
 ..\%__SRC%\lib\sample.lib %_DEST%\lib%_EXT%\sample.lib
 ..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a
+..\%__SRC%\lib\sb.lib %_DEST%\lib%_EXT%\sb.lib
 
 mkdir: %_DEST%\inc%_EXT%\basic
 ..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx
diff --git a/dbaccess/util/makefile.mk b/dbaccess/util/makefile.mk
index 1e6ec3234638..92c5602c379f 100644
--- a/dbaccess/util/makefile.mk
+++ b/dbaccess/util/makefile.mk
@@ -126,10 +126,7 @@ SHL2STDLIBS= \
         $(VOSLIB)				\
         $(SALLIB)
         
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+=	$(LB)$/i$(TARGET).lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC" || "$(GUI)"=="OS2"
 SHL2STDLIBS+= \
         -l$(TARGET)$(DLLPOSTFIX)
 SHL2DEPN=$(SHL1TARGETN)
diff --git a/formula/util/makefile.mk b/formula/util/makefile.mk
index 6a7684224bc3..03fb3f0a6e82 100644
--- a/formula/util/makefile.mk
+++ b/formula/util/makefile.mk
@@ -92,11 +92,7 @@ SHL2STDLIBS= \
         $(CPPUHELPERLIB)        \
         $(SALLIB)
         
-.IF "$(GUI)"=="OS2"
-SHL2STDLIBS+= \
-        $(LB)$/ifor.lib
-SHL2DEPN=$(LB)$/i$(TARGET).lib
-.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
+.IF "$(GUI)"!="WNT" || "$(COM)"=="GCC"
 SHL2STDLIBS+= \
         -lfor$(DLLPOSTFIX)
 SHL2DEPN=$(SHL1TARGETN)
diff --git a/i18npool/source/localedata/data/makefile.mk b/i18npool/source/localedata/data/makefile.mk
index 5d6643204b49..d0fee8c5883b 100644
--- a/i18npool/source/localedata/data/makefile.mk
+++ b/i18npool/source/localedata/data/makefile.mk
@@ -53,9 +53,6 @@ LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
 LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib
 LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib
 .ENDIF
-.ELIF "$(GUI)" == "OS2"
-LINK_LOCALEDATA_EN_LIB=$(LB)$/i$(SHL1TARGET).lib
-LINK_LOCALEDATA_ES_LIB=$(LB)$/i$(SHL2TARGET).lib
 .ELSE
 LINK_LOCALEDATA_EN_LIB=-l$(SHL1TARGET)
 LINK_LOCALEDATA_ES_LIB=-l$(SHL2TARGET)
diff --git a/i18nutil/prj/d.lst b/i18nutil/prj/d.lst
index 6fe8d4925adf..6d8105dacb50 100644
--- a/i18nutil/prj/d.lst
+++ b/i18nutil/prj/d.lst
@@ -11,4 +11,5 @@ 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\i18nutil.lib %_DEST%\lib%_EXT%\i18nutil.lib
 ..\%__SRC%\lib\ii18nutil.lib %_DEST%\lib%_EXT%\i18nutilgcc3.lib
diff --git a/redland/rasqal/rasqal-0.9.16.patch.dmake b/redland/rasqal/rasqal-0.9.16.patch.dmake
index be502c6023b6..f11c7d5aacd7 100644
--- a/redland/rasqal/rasqal-0.9.16.patch.dmake
+++ b/redland/rasqal/rasqal-0.9.16.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:56:45 2008
 +++ misc/build/rasqal-0.9.16/src/makefile.mk	Thu Nov  6 15:55:09 2008
-@@ -1,1 +1,91 @@
+@@ -1,1 +1,96 @@
 -dummy
 +#**************************************************************
 +#  
@@ -82,8 +82,13 @@
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
++.IF "$(GUI)"=="OS2"
++SHL1STDLIBS= \
++    $(PRJ)$/$(INPATH)$/lib$/raptor.lib
++.ELSE
 +SHL1STDLIBS= \
-+    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
++    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib
++.ENDIF
 +
 +
 +#$(LIBXML2LIB) \
diff --git a/redland/redland/redland-1.0.8.patch.dmake b/redland/redland/redland-1.0.8.patch.dmake
index 32b5ac795738..340bc2ca4b30 100644
--- a/redland/redland/redland-1.0.8.patch.dmake
+++ b/redland/redland/redland-1.0.8.patch.dmake
@@ -1,6 +1,6 @@
 --- misc/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:32:46 2008
 +++ misc/build/redland-1.0.8/librdf/makefile.mk	Mon Jun 16 19:26:20 2008
-@@ -1,1 +1,108 @@
+@@ -1,1 +1,115 @@
 -dummy
 +#**************************************************************
 +#  
@@ -97,10 +97,17 @@
 +SHL1DEF=$(MISC)$/$(SHL1TARGET).def
 +DEF1NAME=$(SHL1TARGET)
 +
++.IF "$(GUI)"=="OS2"
++SHL1STDLIBS= \
++    $(OPENSSLLIB) \
++    $(PRJ)$/$(INPATH)$/lib$/raptor.lib \
++    $(PRJ)$/$(INPATH)$/lib$/rasqal.lib
++.ELSE
 +SHL1STDLIBS= \
 +    $(OPENSSLLIB) \
 +    $(PRJ)$/$(INPATH)$/lib$/libraptor.lib \
-+    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib \
++    $(PRJ)$/$(INPATH)$/lib$/librasqal.lib
++.ENDIF
 +
 +
 +#$(LIBXML2LIB) \
diff --git a/sc/util/makefile.mk b/sc/util/makefile.mk
index 372910d0da57..72e0d91fde48 100644
--- a/sc/util/makefile.mk
+++ b/sc/util/makefile.mk
@@ -62,7 +62,9 @@ RESLIB1SRSFILES=\
 # --- StarClac DLL
 
 SHL1TARGET= sc$(DLLPOSTFIX)
+.IF "$(GUI)" != "OS2"
 SHL1USE_EXPORTS=name
+.ENDIF
 SHL1IMPLIB= sci
 
 # dynamic libraries
diff --git a/solenv/inc/libs.mk b/solenv/inc/libs.mk
index fdd283bb9acb..2a391eb55dc2 100644
--- a/solenv/inc/libs.mk
+++ b/solenv/inc/libs.mk
@@ -49,7 +49,11 @@ ICULELIB=-licule
 ICUUCLIB=-licuuc
 ICUDATALIB=-licudata
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
+.IF "$(GUI)"=="OS2"
+I18NUTILLIB=-li18nutil
+.ELSE
 I18NUTILLIB=-li18nutil$(COMID)
+.ENDIF
 .INCLUDE .IGNORE : i18npool/version.mk
 I18NISOLANGLIB=-li18nisolang$(ISOLANG_MAJOR)$(COMID)
 I18NPAPERLIB=-li18npaper$(DLLPOSTFIX)
@@ -190,11 +194,7 @@ TKTLIB=-ltkt$(DLLPOSTFIX)
 SAXLIB=-lsax$(DLLPOSTFIX)
 MAILLIB=-lmail
 DOCMGRLIB=-ldmg$(DLLPOSTFIX)
-.IF "$(GUI)"=="OS2"
-BASICLIB=-lbasic
-.ELSE
 BASICLIB=-lsb$(DLLPOSTFIX)
-.ENDIF
 VBAHELPERLIB=-lvbahelper$(DLLPOSTFIX)
 DBTOOLSLIB=-ldbtools$(DLLPOSTFIX)
 HM2LIBSH=-lhmwrpdll
diff --git a/writerfilter/source/doctok/makefile.mk b/writerfilter/source/doctok/makefile.mk
index 72a8cd93c99a..4ceeb7ea4d18 100644
--- a/writerfilter/source/doctok/makefile.mk
+++ b/writerfilter/source/doctok/makefile.mk
@@ -65,10 +65,8 @@ SLOFILES= \
 
 SHL1TARGET=$(TARGET)
 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
 RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
 .ELIF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 RESOURCEMODELLIB=-lresourcemodel
diff --git a/writerfilter/source/ooxml/makefile.mk b/writerfilter/source/ooxml/makefile.mk
index fe15eedfe01e..c6609e2d8ac7 100644
--- a/writerfilter/source/ooxml/makefile.mk
+++ b/writerfilter/source/ooxml/makefile.mk
@@ -82,10 +82,8 @@ SLOFILES= \
 
 SHL1TARGET=$(TARGET)
 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
 RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
 .ELIF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 RESOURCEMODELLIB=-lresourcemodel
diff --git a/writerfilter/unocomponent/makefile.mk b/writerfilter/unocomponent/makefile.mk
index 1aeb6661c501..518ee1b36df5 100644
--- a/writerfilter/unocomponent/makefile.mk
+++ b/writerfilter/unocomponent/makefile.mk
@@ -40,14 +40,10 @@ SLOFILES=$(SLO)$/component.obj
 
 SHL1TARGET=$(TARGET)
 
-.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC"
+.IF "$(GUI)"=="UNX" || "$(GUI)"=="MAC" || "$(GUI)"=="OS2"
 DOCTOKLIB=-ldoctok
 OOXMLLIB=-looxml
 RESOURCEMODELLIB=-lresourcemodel
-.ELIF "$(GUI)"=="OS2"
-DOCTOKLIB=$(LB)$/idoctok.lib
-OOXMLLIB=$(LB)$/iooxml.lib
-RESOURCEMODELLIB=$(LB)$/iresourcemodel.lib
 .ELIF "$(GUI)"=="WNT"
 .IF "$(COM)"=="GCC"
 DOCTOKLIB=-ldoctok
diff --git a/xmlreader/source/makefile.mk b/xmlreader/source/makefile.mk
index 3d9dbd324574..36d0cb5c8b0b 100644
--- a/xmlreader/source/makefile.mk
+++ b/xmlreader/source/makefile.mk
@@ -43,9 +43,7 @@ SHL1RPATH = URELIB
 SHL1STDLIBS = \
     $(SALLIB)
 SHL1TARGET = xmlreader
-.IF "$(GUI)" != "OS2"
 SHL1USE_EXPORTS = name
-.ENDIF
 DEF1NAME = $(SHL1TARGET)
 
 .INCLUDE: target.mk