INTEGRATION: CWS os2port03 (1.201.46); FILE MERGED

2008/07/16 12:19:53 obr 1.201.46.3: RESYNC: (1.202-1.209); FILE MERGED
2008/01/15 13:52:12 obr 1.201.46.2: RESYNC: (1.201-1.202); FILE MERGED
2008/01/15 09:36:36 ydario 1.201.46.1: os2 build system makefile changes.
Issue number:i85203
Submitted by:ydario

1 files changed, 21 insertions, 18 deletions

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 87b40a59fa31..797279520245 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -8,7 +8,7 @@
 #
 # $RCSfile: target.mk,v $
 #
-# $Revision: 1.209 $
+# $Revision: 1.210 $
 #
 # This file is part of OpenOffice.org.
 #
@@ -35,6 +35,10 @@ MKFILENAME:=TARGET.MK
 # INCLUDE-Path
 # ------------------------------------------------------------------
 
+.IF "$(STL_OS2_BUILDING)" != ""
+CDEFS+=-DSTL_OS2_BUILDING
+.ENDIF
+
 .IF "$(TARGET)"==""
 target_empty=warn_target_empty
 .ENDIF
@@ -205,7 +209,7 @@ DEPIDLFILES:=$(foreach,i,$(IDLFILES) $(IDLDIRS)$/$i)
 DEPIDLFILES:=$(IDLFILES)
 .ENDIF			# "$(EXTERNIDLFILES)"!=""
 .ELSE			# "$(LOCALIDLFILES)$(EXTERNIDLFILES)"!=""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 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 )  ))
@@ -451,7 +455,7 @@ APP2BASEX=/BASE:$(APP2BASE)
 .IF "$(APP3TARGET)"!=""
 APP3TARGETN=$(BIN)$/$(APP3TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP3BASE)"==""
 APP3BASE=$(BASE)
 .ENDIF
@@ -511,7 +515,7 @@ APP7BASEX=/BASE:$(APP7BASE)
 .IF "$(APP8TARGET)"!=""
 APP8TARGETN=$(BIN)$/$(APP8TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP8BASE)"==""
 APP8BASE=$(BASE)
 .ENDIF
@@ -523,7 +527,7 @@ APP8BASEX=/BASE:$(APP8BASE)
 .IF "$(APP9TARGET)"!=""
 APP9TARGETN=$(BIN)$/$(APP9TARGET)$(EXECPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(APP9BASE)"==""
 APP9BASE=$(BASE)
 .ENDIF
@@ -539,7 +543,7 @@ SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL1DLLPRE*=$(DLLPRE)
 SHL1TARGETN=$(DLLDEST)$/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL1BASE)"==""
 SHL1BASE=$(BASE)
 .ENDIF
@@ -555,7 +559,7 @@ SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL2DLLPRE*=$(DLLPRE)
 SHL2TARGETN=$(DLLDEST)$/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL2BASE)"==""
 SHL2BASE=$(BASE)
 .ENDIF
@@ -571,7 +575,7 @@ SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL3DLLPRE*=$(DLLPRE)
 SHL3TARGETN=$(DLLDEST)$/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL3BASE)"==""
 SHL3BASE=$(BASE)
 .ENDIF
@@ -587,7 +591,7 @@ SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL4DLLPRE*=$(DLLPRE)
 SHL4TARGETN=$(DLLDEST)$/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL4BASE)"==""
 SHL4BASE=$(BASE)
 .ENDIF
@@ -603,7 +607,7 @@ SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL5DLLPRE*=$(DLLPRE)
 SHL5TARGETN=$(DLLDEST)$/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL5BASE)"==""
 SHL5BASE=$(BASE)
 .ENDIF
@@ -619,7 +623,7 @@ SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL6DLLPRE*=$(DLLPRE)
 SHL6TARGETN=$(DLLDEST)$/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL6BASE)"==""
 SHL6BASE=$(BASE)
 .ENDIF
@@ -635,7 +639,7 @@ SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL7DLLPRE*=$(DLLPRE)
 SHL7TARGETN=$(DLLDEST)$/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL7BASE)"==""
 SHL7BASE=$(BASE)
 .ENDIF
@@ -651,7 +655,7 @@ SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL8DLLPRE*=$(DLLPRE)
 SHL8TARGETN=$(DLLDEST)$/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL8BASE)"==""
 SHL8BASE=$(BASE)
 .ENDIF
@@ -667,7 +671,7 @@ SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
 SHL9DLLPRE*=$(DLLPRE)
 SHL9TARGETN=$(DLLDEST)$/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(SHL9BASE)"==""
 SHL9BASE=$(BASE)
 .ENDIF
@@ -789,7 +793,7 @@ LIB8TARGETN=$(LIB8TARGET)
 LIB9TARGETN=$(LIB9TARGET)
 .ENDIF
 
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
 .IF "$(COM)"!="GCC"
 LIB1ARCHIV=
 LIB2ARCHIV=
@@ -1260,7 +1264,7 @@ CPPUMAKERFLAGS*=-L
 .IF "$(UNOTYPES)" != ""
 # makeing all in one
 .DIRCACHE=no
-.IF "$(ENVINCPRE))"!=""
+.IF "$(ENVINCPRE)"!=""
 MKDEPFLAGS+=-I:$(ENVINCPRE)
 .ENDIF			# "$(ENVINCPRE))"!=""
 .IF "$(OBJFILES)"!=""
@@ -1763,7 +1767,7 @@ ALLTAR : forcedeps
     @$(TOUCH) $(TMP)$/makedt.don
 
 killbin:
-.IF "$(GUI)"=="WNT"
+.IF "$(GUI)"=="WNT" || "$(GUI)"=="OS2"
     @$(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)
@@ -2085,4 +2089,3 @@ $(SUBDIRS) .PHONY :
 # if the previous block was a rule or a target, "\#" isn't recognized
 # as an escaped "#". if it was an assignment, escaping works...
 some_unique_variable_name:=1
-