INTEGRATION: CWS ause069 (1.10.2); FILE MERGED

2006/12/04 19:25:16 hjs 1.10.2.2: RESYNC: (1.10-1.11); FILE MERGED
2006/10/11 12:36:22 hjs 1.10.2.1: #i70359#: removing + sign in targets; adding to tool macro if required

1 files changed, 120 insertions, 120 deletions

diff --git a/solenv/inc/_tg_srs.mk b/solenv/inc/_tg_srs.mk
index 1b5e8d9857e1..c392bdc5f859 100644
--- a/solenv/inc/_tg_srs.mk
+++ b/solenv/inc/_tg_srs.mk
@@ -7,9 +7,9 @@ HIDSRS1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS1NAME)_srs.hid
 $(HIDSRS1PARTICLE) : $(HID1FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID1FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS1PARTICLE)
 
@@ -18,16 +18,16 @@ ALLTAR : $(HIDSRS1PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS1NAME).dprr: $(SRC1FILES) $(HIDSRS1PARTICLE) $(HID1FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS1NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ $(SRC1FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS1NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS1NAME).srs} -fo=$@ $(SRC1FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS1NAME).srs: $(foreach,i,$(SRC1FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -35,15 +35,15 @@ $(SRS)$/$(SRS1NAME).srs: $(SRC1FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS1NAME)"!=""
 
@@ -56,9 +56,9 @@ HIDSRS2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS2NAME)_srs.hid
 $(HIDSRS2PARTICLE) : $(HID2FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID2FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS2PARTICLE)
 
@@ -67,16 +67,16 @@ ALLTAR : $(HIDSRS2PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS2NAME).dprr: $(SRC2FILES) $(HIDSRS2PARTICLE) $(HID2FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS2NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ $(SRC2FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS2NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS2NAME).srs} -fo=$@ $(SRC2FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS2NAME).srs: $(foreach,i,$(SRC2FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -84,15 +84,15 @@ $(SRS)$/$(SRS2NAME).srs: $(SRC2FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS2NAME)"!=""
 
@@ -105,9 +105,9 @@ HIDSRS3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS3NAME)_srs.hid
 $(HIDSRS3PARTICLE) : $(HID3FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID3FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS3PARTICLE)
 
@@ -116,16 +116,16 @@ ALLTAR : $(HIDSRS3PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS3NAME).dprr: $(SRC3FILES) $(HIDSRS3PARTICLE) $(HID3FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS3NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ $(SRC3FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS3NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS3NAME).srs} -fo=$@ $(SRC3FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS3NAME).srs: $(foreach,i,$(SRC3FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -133,15 +133,15 @@ $(SRS)$/$(SRS3NAME).srs: $(SRC3FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS3NAME)"!=""
 
@@ -154,9 +154,9 @@ HIDSRS4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS4NAME)_srs.hid
 $(HIDSRS4PARTICLE) : $(HID4FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID4FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS4PARTICLE)
 
@@ -165,16 +165,16 @@ ALLTAR : $(HIDSRS4PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS4NAME).dprr: $(SRC4FILES) $(HIDSRS4PARTICLE) $(HID4FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS4NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ $(SRC4FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS4NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS4NAME).srs} -fo=$@ $(SRC4FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS4NAME).srs: $(foreach,i,$(SRC4FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -182,15 +182,15 @@ $(SRS)$/$(SRS4NAME).srs: $(SRC4FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS4NAME)"!=""
 
@@ -203,9 +203,9 @@ HIDSRS5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS5NAME)_srs.hid
 $(HIDSRS5PARTICLE) : $(HID5FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID5FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS5PARTICLE)
 
@@ -214,16 +214,16 @@ ALLTAR : $(HIDSRS5PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS5NAME).dprr: $(SRC5FILES) $(HIDSRS5PARTICLE) $(HID5FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS5NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ $(SRC5FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS5NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS5NAME).srs} -fo=$@ $(SRC5FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS5NAME).srs: $(foreach,i,$(SRC5FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -231,15 +231,15 @@ $(SRS)$/$(SRS5NAME).srs: $(SRC5FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS5NAME)"!=""
 
@@ -252,9 +252,9 @@ HIDSRS6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS6NAME)_srs.hid
 $(HIDSRS6PARTICLE) : $(HID6FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID6FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS6PARTICLE)
 
@@ -263,16 +263,16 @@ ALLTAR : $(HIDSRS6PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS6NAME).dprr: $(SRC6FILES) $(HIDSRS6PARTICLE) $(HID6FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS6NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ $(SRC6FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS6NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS6NAME).srs} -fo=$@ $(SRC6FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS6NAME).srs: $(foreach,i,$(SRC6FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -280,15 +280,15 @@ $(SRS)$/$(SRS6NAME).srs: $(SRC6FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS6NAME)"!=""
 
@@ -301,9 +301,9 @@ HIDSRS7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS7NAME)_srs.hid
 $(HIDSRS7PARTICLE) : $(HID7FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID7FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS7PARTICLE)
 
@@ -312,16 +312,16 @@ ALLTAR : $(HIDSRS7PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS7NAME).dprr: $(SRC7FILES) $(HIDSRS7PARTICLE) $(HID7FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS7NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ $(SRC7FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS7NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS7NAME).srs} -fo=$@ $(SRC7FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS7NAME).srs: $(foreach,i,$(SRC7FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -329,15 +329,15 @@ $(SRS)$/$(SRS7NAME).srs: $(SRC7FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS7NAME)"!=""
 
@@ -350,9 +350,9 @@ HIDSRS8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS8NAME)_srs.hid
 $(HIDSRS8PARTICLE) : $(HID8FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID8FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS8PARTICLE)
 
@@ -361,16 +361,16 @@ ALLTAR : $(HIDSRS8PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS8NAME).dprr: $(SRC8FILES) $(HIDSRS8PARTICLE) $(HID8FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS8NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ $(SRC8FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS8NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS8NAME).srs} -fo=$@ $(SRC8FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS8NAME).srs: $(foreach,i,$(SRC8FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -378,15 +378,15 @@ $(SRS)$/$(SRS8NAME).srs: $(SRC8FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS8NAME)"!=""
 
@@ -399,9 +399,9 @@ HIDSRS9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS9NAME)_srs.hid
 $(HIDSRS9PARTICLE) : $(HID9FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID9FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS9PARTICLE)
 
@@ -410,16 +410,16 @@ ALLTAR : $(HIDSRS9PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS9NAME).dprr: $(SRC9FILES) $(HIDSRS9PARTICLE) $(HID9FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS9NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ $(SRC9FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS9NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS9NAME).srs} -fo=$@ $(SRC9FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS9NAME).srs: $(foreach,i,$(SRC9FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -427,15 +427,15 @@ $(SRS)$/$(SRS9NAME).srs: $(SRC9FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS9NAME)"!=""
 
@@ -448,9 +448,9 @@ HIDSRS10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(SRS))$/$(SRS10NAME)_srs.h
 $(HIDSRS10PARTICLE) : $(HID10FILES)
     @echo ------------------------------
     @echo Making: $@
-    @+-$(RM) $@
-    +$(TYPE) $(mktmp  $(subst,$/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
-    @+$(RENAME) $@.$(ROUT).tmp $@
+    @-$(RM) $@
+    $(TYPE) $(mktmp  $(subst,$/,/ $(HID10FILES))) | xargs -s 1000 cat > $@.$(ROUT).tmp
+    @$(RENAME) $@.$(ROUT).tmp $@
 
 ALLTAR : $(HIDSRS10PARTICLE)
 
@@ -459,16 +459,16 @@ ALLTAR : $(HIDSRS10PARTICLE)
 $(MISC)$/$(PWD:f).$(SRS10NAME).dprr: $(SRC10FILES) $(HIDSRS10PARTICLE) $(HID10FILES)
     @echo ------------------------------
     @echo Making: $@
-    +-$(RM) $(MISC)$/$(PWD:f).$(SRS10NAME).dprr >& $(NULLDEV)
-    +$(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ $(SRC10FILES)
+    -$(RM) $(MISC)$/$(PWD:f).$(SRS10NAME).dprr >& $(NULLDEV)
+    $(RSC) $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) -I$(INCLOCPRJ)  -I$(INCLOCAL) -I$(INC) -I$(INCCOM) $(RSCDEFS) $(RSCUPDVERDEF) -fp={$(SRS)$/$(SRS10NAME).srs} -fo=$@ $(SRC10FILES)
 
 .IF "$(WITH_LANG)"!=""
 $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i) : $$(@:f) localize.sdf 
     -$(MKDIR) $(@:d)
-    +-$(RM) $@
+    -$(RM) $@
     $(WRAPCMD) $(TRANSEX) -p $(PRJNAME) -i $(@:f) -o $(@).$(INPATH) -m localize.sdf -l all
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 $(SRS)$/$(SRS10NAME).srs: $(foreach,i,$(SRC10FILES) $(COMMONMISC)$/$(TARGET)$/$i)
 .ELSE			# "$(WITH_LANG)"!=""
@@ -476,15 +476,15 @@ $(SRS)$/$(SRS10NAME).srs: $(SRC10FILES)
 .ENDIF			# "$(WITH_LANG)"!=""
     @echo ------------------------------
     @echo Making: $@
-    +$(RSC) -presponse @$(mktmp \
+    $(RSC) -presponse @$(mktmp \
         $(SRSDEFAULT) $(RSC_SRS_CHARSET) $(RSCFLAGS) -I$(RSCEXTINC) \
         $(INCLUDE) $(RSCDEFS) $(RSCUPDVERDEF) \
         -fp=$@.$(INPATH) \
         $< \
     )
-    +-$(RM) $@
-    +$(RENAME) $@.$(INPATH) $@
-    +-$(RM) $@.$(INPATH)
+    -$(RM) $@
+    $(RENAME) $@.$(INPATH) $@
+    -$(RM) $@.$(INPATH)
 
 .ENDIF          # "$(SRS10NAME)"!=""