INTEGRATION: CWS ause069 (1.11.2); FILE MERGED

2006/10/11 12:36:22 hjs 1.11.2.1: #i70359#: removing + sign in targets; adding to tool macro if required
This commit is contained in:
Oliver Bolte 2007-01-25 11:50:16 +00:00
parent 64f711f5b9
commit c5c1472924

View file

@ -5,7 +5,7 @@
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP1FILES=$(foreach,i,$(SCP1FILES) $(foreach,j,$(SCP1LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -13,7 +13,7 @@ $(SCP1TARGETN): $(LOCALSCP1FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP1LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP1FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -24,7 +24,7 @@ $(SCP1TARGETN): $(LOCALSCP1FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP2FILES=$(foreach,i,$(SCP2FILES) $(foreach,j,$(SCP2LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -32,7 +32,7 @@ $(SCP2TARGETN): $(LOCALSCP2FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP2LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP2FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -43,7 +43,7 @@ $(SCP2TARGETN): $(LOCALSCP2FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP3FILES=$(foreach,i,$(SCP3FILES) $(foreach,j,$(SCP3LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -51,7 +51,7 @@ $(SCP3TARGETN): $(LOCALSCP3FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP3LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP3FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -62,7 +62,7 @@ $(SCP3TARGETN): $(LOCALSCP3FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP4FILES=$(foreach,i,$(SCP4FILES) $(foreach,j,$(SCP4LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -70,7 +70,7 @@ $(SCP4TARGETN): $(LOCALSCP4FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP4LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP4FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -81,7 +81,7 @@ $(SCP4TARGETN): $(LOCALSCP4FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP5FILES=$(foreach,i,$(SCP5FILES) $(foreach,j,$(SCP5LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -89,7 +89,7 @@ $(SCP5TARGETN): $(LOCALSCP5FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP5LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP5FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -100,7 +100,7 @@ $(SCP5TARGETN): $(LOCALSCP5FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP6FILES=$(foreach,i,$(SCP6FILES) $(foreach,j,$(SCP6LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -108,7 +108,7 @@ $(SCP6TARGETN): $(LOCALSCP6FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP6LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP6FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -119,7 +119,7 @@ $(SCP6TARGETN): $(LOCALSCP6FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP7FILES=$(foreach,i,$(SCP7FILES) $(foreach,j,$(SCP7LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -127,7 +127,7 @@ $(SCP7TARGETN): $(LOCALSCP7FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP7LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP7FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -138,7 +138,7 @@ $(SCP7TARGETN): $(LOCALSCP7FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP8FILES=$(foreach,i,$(SCP8FILES) $(foreach,j,$(SCP8LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -146,7 +146,7 @@ $(SCP8TARGETN): $(LOCALSCP8FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP8LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP8FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -157,7 +157,7 @@ $(SCP8TARGETN): $(LOCALSCP8FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP9FILES=$(foreach,i,$(SCP9FILES) $(foreach,j,$(SCP9LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -165,7 +165,7 @@ $(SCP9TARGETN): $(LOCALSCP9FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP9LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP9FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken
@ -176,7 +176,7 @@ $(SCP9TARGETN): $(LOCALSCP9FILES)
# try to get missing parfiles
$(PAR)$/%.par : $(SOLARPARDIR)$/%.par
@-$(MKDIRHIER) $(@:d:d) >& $(NULLDEV)
+$(COPY) $< $@
$(COPY) $< $@
LOCALSCP10FILES=$(foreach,i,$(SCP10FILES) $(foreach,j,$(SCP10LINK_PRODUCT_TYPE) $(PAR)$/$j$/$i ))
@ -184,7 +184,7 @@ $(SCP10TARGETN): $(LOCALSCP10FILES)
@echo ------------------------------
@echo Making: $@
@-$(MKDIRHIER) $(BIN)$/$(SCP10LINK_PRODUCT_TYPE) >& $(NULLDEV)
+$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
$(SCPLINK) $(SCPLINKFLAGS) @@$(mktmp $(foreach,i,$(SCP10FILES) $(subst,$(@:d:d:d), $(@:d:d))$/$(i:+","))) -o $@
.ENDIF
# Anweisungen fuer das Linken