Kill OS/2 stuff

1 files changed, 15 insertions, 18 deletions

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 3da903e7c2ed..8b5902fede73 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -31,9 +31,6 @@ MKFILENAME:=TARGET.MK
 # INCLUDE-Path
 # ------------------------------------------------------------------
 
-.IF "$(STL_OS2_BUILDING)" != ""
-CDEFS+=-DSTL_OS2_BUILDING
-.ENDIF
 .IF "$(VISIBILITY_HIDDEN)" != ""
 .IF "$(COMNAME)" == "gcc3" && "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 CFLAGS += -fvisibility=hidden
@@ -197,7 +194,7 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)/$i)
 DEPIDLFILES:=$(IDLFILES)
 .ENDIF			# "$(EXTERNIDLFILES)"!=""
 .ELSE			# "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i) $i $(shell @($(FIND) $(IDLDIRS) -name $(i:f)) | $(SED) s/\//\\/g )))
 .ELSE			# "$(GUI)"=="WNT"
 DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(!null,$(shell @$(FIND) . -name $i -print) $i $(shell @$(FIND) $(IDLDIRS) -name $(i:f) -print )  ))
@@ -441,7 +438,7 @@ APP2BASEX=/BASE:$(APP2BASE)
 .IF "$(APP3TARGET)"!=""
 APP3TARGETN=$(BIN)/$(APP3TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP3BASE)"==""
 APP3BASE=$(BASE)
 .ENDIF
@@ -501,7 +498,7 @@ APP7BASEX=/BASE:$(APP7BASE)
 .IF "$(APP8TARGET)"!=""
 APP8TARGETN=$(BIN)/$(APP8TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP8BASE)"==""
 APP8BASE=$(BASE)
 .ENDIF
@@ -513,7 +510,7 @@ APP8BASEX=/BASE:$(APP8BASE)
 .IF "$(APP9TARGET)"!=""
 APP9TARGETN=$(BIN)/$(APP9TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(APP9BASE)"==""
 APP9BASE=$(BASE)
 .ENDIF
@@ -529,7 +526,7 @@ SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL1DLLPRE*=$(DLLPRE)
 SHL1TARGETN=$(DLLDEST)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL1BASE)"==""
 SHL1BASE=$(BASE)
 .ENDIF
@@ -545,7 +542,7 @@ SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL2DLLPRE*=$(DLLPRE)
 SHL2TARGETN=$(DLLDEST)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL2BASE)"==""
 SHL2BASE=$(BASE)
 .ENDIF
@@ -561,7 +558,7 @@ SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL3DLLPRE*=$(DLLPRE)
 SHL3TARGETN=$(DLLDEST)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL3BASE)"==""
 SHL3BASE=$(BASE)
 .ENDIF
@@ -577,7 +574,7 @@ SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL4DLLPRE*=$(DLLPRE)
 SHL4TARGETN=$(DLLDEST)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL4BASE)"==""
 SHL4BASE=$(BASE)
 .ENDIF
@@ -593,7 +590,7 @@ SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL5DLLPRE*=$(DLLPRE)
 SHL5TARGETN=$(DLLDEST)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL5BASE)"==""
 SHL5BASE=$(BASE)
 .ENDIF
@@ -609,7 +606,7 @@ SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL6DLLPRE*=$(DLLPRE)
 SHL6TARGETN=$(DLLDEST)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL6BASE)"==""
 SHL6BASE=$(BASE)
 .ENDIF
@@ -625,7 +622,7 @@ SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL7DLLPRE*=$(DLLPRE)
 SHL7TARGETN=$(DLLDEST)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL7BASE)"==""
 SHL7BASE=$(BASE)
 .ENDIF
@@ -641,7 +638,7 @@ SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL8DLLPRE*=$(DLLPRE)
 SHL8TARGETN=$(DLLDEST)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL8BASE)"==""
 SHL8BASE=$(BASE)
 .ENDIF
@@ -657,7 +654,7 @@ SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL9DLLPRE*=$(DLLPRE)
 SHL9TARGETN=$(DLLDEST)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(SHL9BASE)"==""
 SHL9BASE=$(BASE)
 .ENDIF
@@ -779,7 +776,7 @@ LIB8TARGETN=$(LIB8TARGET)
 LIB9TARGETN=$(LIB9TARGET)
 .ENDIF
 
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
 .IF "$(COM)"!="GCC"
 LIB1ARCHIV=
 LIB2ARCHIV=
@@ -1756,7 +1753,7 @@ ALLTAR : forcedeps
     @$(TOUCH) $(TMP)/makedt.don
 
 killbin:
-.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
+.IF "$(GUI)"=="WNT"
     @$(IFEXIST) $(BIN)/$(SHL1TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL1TARGET).dll $(FI)
     @$(IFEXIST) $(BIN)/$(SHL2TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL2TARGET).dll $(FI)
     @$(IFEXIST) $(BIN)/$(SHL3TARGET).dll $(THEN) $(RM:s/+//) $(BIN)/$(SHL3TARGET).dll $(FI)