INTEGRATION: CWS presfixes12 (1.186.12); FILE MERGED

2007/04/30 08:52:03 thb 1.186.12.3: RESYNC: (1.191-1.196); FILE MERGED
2007/02/21 14:54:52 thb 1.186.12.2: RESYNC: (1.186-1.191); FILE MERGED
2007/01/31 11:46:11 thb 1.186.12.1: #i74053# Added SHLxDLLPRE (thx ause!)

1 files changed, 29 insertions, 20 deletions

diff --git a/solenv/inc/target.mk b/solenv/inc/target.mk
index 834677e981f4..0898f6d2c5f6 100644
--- a/solenv/inc/target.mk
+++ b/solenv/inc/target.mk
@@ -4,9 +4,9 @@
 #
 #   $RCSfile: target.mk,v $
 #
-#   $Revision: 1.199 $
+#   $Revision: 1.200 $
 #
-#   last change: $Author: hr $ $Date: 2007-06-27 22:04:57 $
+#   last change: $Author: obo $ $Date: 2007-07-17 14:27:45 $
 #
 #   The Contents of this file are made available subject to
 #   the terms of GNU Lesser General Public License Version 2.1.
@@ -528,7 +528,8 @@ APP9BASEX=/BASE:$(APP9BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL1TARGET!:=$(SHL1TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL1TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL1TARGET)$(DLLPOST)
+SHL1DLLPRE*=$(DLLPRE)
+SHL1TARGETN=$(DLLDEST)$/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL1BASE)"==""
@@ -543,7 +544,8 @@ SHL1BASEX=/BASE:$(SHL1BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL2TARGET!:=$(SHL2TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL2TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL2TARGET)$(DLLPOST)
+SHL2DLLPRE*=$(DLLPRE)
+SHL2TARGETN=$(DLLDEST)$/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL2BASE)"==""
@@ -558,7 +560,8 @@ SHL2BASEX=/BASE:$(SHL2BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL3TARGET!:=$(SHL3TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL3TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL3TARGET)$(DLLPOST)
+SHL3DLLPRE*=$(DLLPRE)
+SHL3TARGETN=$(DLLDEST)$/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL3BASE)"==""
@@ -573,7 +576,8 @@ SHL3BASEX=/BASE:$(SHL3BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL4TARGET!:=$(SHL4TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL4TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL4TARGET)$(DLLPOST)
+SHL4DLLPRE*=$(DLLPRE)
+SHL4TARGETN=$(DLLDEST)$/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL4BASE)"==""
@@ -588,7 +592,8 @@ SHL4BASEX=/BASE:$(SHL4BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL5TARGET!:=$(SHL5TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL5TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL5TARGET)$(DLLPOST)
+SHL5DLLPRE*=$(DLLPRE)
+SHL5TARGETN=$(DLLDEST)$/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL5BASE)"==""
@@ -603,7 +608,8 @@ SHL5BASEX=/BASE:$(SHL5BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL6TARGET!:=$(SHL6TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL6TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL6TARGET)$(DLLPOST)
+SHL6DLLPRE*=$(DLLPRE)
+SHL6TARGETN=$(DLLDEST)$/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL6BASE)"==""
@@ -618,7 +624,8 @@ SHL6BASEX=/BASE:$(SHL6BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL7TARGET!:=$(SHL7TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL7TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL7TARGET)$(DLLPOST)
+SHL7DLLPRE*=$(DLLPRE)
+SHL7TARGETN=$(DLLDEST)$/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL7BASE)"==""
@@ -633,7 +640,8 @@ SHL7BASEX=/BASE:$(SHL7BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL8TARGET!:=$(SHL8TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL8TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL8TARGET)$(DLLPOST)
+SHL8DLLPRE*=$(DLLPRE)
+SHL8TARGETN=$(DLLDEST)$/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL8BASE)"==""
@@ -648,7 +656,8 @@ SHL8BASEX=/BASE:$(SHL8BASE)
 .IF "$(WINVERSIONNAMES)"!=""
 SHL9TARGET!:=$(SHL9TARGET)$($(WINVERSIONNAMES)_MAJOR)
 .ENDIF			# "$(WINVERSIONNAMES)"!=""
-SHL9TARGETN=$(DLLDEST)$/$(DLLPRE)$(SHL9TARGET)$(DLLPOST)
+SHL9DLLPRE*=$(DLLPRE)
+SHL9TARGETN=$(DLLDEST)$/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
 .IF "$(BASE)" != ""
 .IF "$(GUI)"=="WNT"
 .IF "$(SHL9BASE)"==""
@@ -1788,31 +1797,31 @@ killbin:
 
 .ELSE			# "$(GUI)"=="WNT"
 .IF "$(SHL1TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL1TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL1DLLPRE)$(SHL1TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL2TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL2TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL2DLLPRE)$(SHL2TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL3TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL3TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL3DLLPRE)$(SHL3TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL4TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL4TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL4DLLPRE)$(SHL4TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL5TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL5TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL5DLLPRE)$(SHL5TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL6TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL6TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL6DLLPRE)$(SHL6TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL7TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL7TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL7DLLPRE)$(SHL7TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL8TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL8TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL8DLLPRE)$(SHL8TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(SHL9TARGET)"!=""
-    @-$(RM) $(LB)/$(DLLPRE)$(SHL9TARGET)$(DLLPOST)
+    @-$(RM) $(LB)/$(SHL9DLLPRE)$(SHL9TARGET)$(DLLPOST)
 .ENDIF
 .IF "$(APP1TARGET)"!=""
     @-$(RM) $(BIN)/$(APP1TARGET)$(EXECPOST)