INTEGRATION: CWS ause074 (1.12.8); FILE MERGED

2007/02/02 11:51:33 hjs 1.12.8.1: #i74085# avoid useless shell calls

1 files changed, 20 insertions, 20 deletions

diff --git a/solenv/inc/_tg_scp.mk b/solenv/inc/_tg_scp.mk
index 14308213dd17..6764c5a80f53 100644
--- a/solenv/inc/_tg_scp.mk
+++ b/solenv/inc/_tg_scp.mk
@@ -4,7 +4,7 @@
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -12,7 +12,7 @@ LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(P
 $(SCP1TARGETN): $(LOCALSCP1FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP1LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP1LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -23,7 +23,7 @@ $(SCP1TARGETN): $(LOCALSCP1FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -31,7 +31,7 @@ LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(P
 $(SCP2TARGETN): $(LOCALSCP2FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP2LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP2LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -42,7 +42,7 @@ $(SCP2TARGETN): $(LOCALSCP2FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -50,7 +50,7 @@ LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(P
 $(SCP3TARGETN): $(LOCALSCP3FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP3LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP3LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -61,7 +61,7 @@ $(SCP3TARGETN): $(LOCALSCP3FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -69,7 +69,7 @@ LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(P
 $(SCP4TARGETN): $(LOCALSCP4FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP4LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP4LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -80,7 +80,7 @@ $(SCP4TARGETN): $(LOCALSCP4FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -88,7 +88,7 @@ LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(P
 $(SCP5TARGETN): $(LOCALSCP5FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP5LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP5LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -99,7 +99,7 @@ $(SCP5TARGETN): $(LOCALSCP5FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -107,7 +107,7 @@ LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(P
 $(SCP6TARGETN): $(LOCALSCP6FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP6LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP6LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -118,7 +118,7 @@ $(SCP6TARGETN): $(LOCALSCP6FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -126,7 +126,7 @@ LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(P
 $(SCP7TARGETN): $(LOCALSCP7FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP7LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP7LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -137,7 +137,7 @@ $(SCP7TARGETN): $(LOCALSCP7FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -145,7 +145,7 @@ LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(P
 $(SCP8TARGETN): $(LOCALSCP8FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP8LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP8LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -156,7 +156,7 @@ $(SCP8TARGETN): $(LOCALSCP8FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -164,7 +164,7 @@ LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(P
 $(SCP9TARGETN): $(LOCALSCP9FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP9LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP9LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF
 
@@ -175,7 +175,7 @@ $(SCP9TARGETN): $(LOCALSCP9FILES)
 
 # try to get missing parfiles
 $(PAR)$/%.par : $(SOLARPARDIR)$/%.par
-    @-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(@:d:d)
     $(COPY) $< $@
 
 LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@@ -183,7 +183,7 @@ LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE)
 $(SCP10TARGETN): $(LOCALSCP10FILES)
     @echo ------------------------------
     @echo Making: $@
-    @-$(MKDIRHIER) $(BIN)$/$(SCP10LINK_PRODUCT_TYPE) >& $(NULLDEV)
+    @@-$(MKDIRHIER) $(BIN)$/$(SCP10LINK_PRODUCT_TYPE)
     $(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
 .ENDIF