INTEGRATION: CWS os2port01 (1.24.14); FILE MERGED

2007/09/05 08:40:16 obr 1.24.14.3: RESYNC: (1.27-1.28); FILE MERGED
2007/07/18 12:14:37 obr 1.24.14.2: RESYNC: (1.24-1.27); FILE MERGED
2006/12/28 15:04:27 ydario 1.24.14.1: OS/2 initial import.

salhelper/source/makefile.mk

@@ -4,9 +4,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.28 $
+#   $Revision: 1.29 $
 #
-#   last change: $Author: hr $ $Date: 2007-08-03 12:32:52 $
+#   last change: $Author: vg $ $Date: 2007-09-20 15:04:26 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -41,7 +41,7 @@ ENABLE_EXCEPTIONS=TRUE
 NO_BSYMBOLIC=TRUE
 USE_DEFFILE=TRUE
 
-.IF "$(OS)" != "WNT"
+.IF "$(OS)" != "WNT" && "$(GUI)"!="OS2"
 UNIXVERSIONNAMES=UDK
 .ENDIF # WNT
 
@@ -57,12 +57,14 @@ SLOFILES=	\
     $(SLO)$/simplereferenceobject.obj
 
 # SCO: the linker does know about weak symbols, but we can't ignore multiple defined symbols
-.IF "$(OS)"=="SCO" || "$(OS)$(COM)"=="OS2GCC"
+.IF "$(OS)"=="SCO"
 SLOFILES+=$(SLO)$/staticmb.obj
 .ENDIF
 
 .IF "$(GUI)" == "WNT"
 SHL1TARGET=	$(TARGET)$(UDK_MAJOR)$(COMID)
+.ELIF "$(GUI)" == "OS2"
+SHL1TARGET=	salhelp$(UDK_MAJOR)
 .ELSE
 SHL1TARGET=	uno_$(TARGET)$(COMID)
 .ENDIF