From b2379c07ee69bab0ca033c1ed346ebe90d55ed23 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Thu, 5 Oct 2006 09:34:53 +0000 Subject: INTEGRATION: CWS ause068 (1.18.86); FILE MERGED 2006/09/15 13:26:32 hjs 1.18.86.1: #i69536# don't force shell for echo --- solenv/inc/_tg_rslb.mk | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) (limited to 'solenv/inc/_tg_rslb.mk') diff --git a/solenv/inc/_tg_rslb.mk b/solenv/inc/_tg_rslb.mk index 9785ae7f64cd..e713eba150f3 100644 --- a/solenv/inc/_tg_rslb.mk +++ b/solenv/inc/_tg_rslb.mk @@ -6,7 +6,6 @@ HIDRES1PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB1NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB1HIDFILESx=$(shell @+echo $(RESLIB1SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB1HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB1SRSFILES))) $(HIDRES1PARTICLE): $(RESLIB1HIDFILES) @echo ------------------------------ @@ -24,7 +23,7 @@ $(RSC_MULTI1) : \ $(RESLIB1SRSFILES) \ $(RESLIB1TARGETN) \ $(RESLIB1BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -85,7 +84,6 @@ $(RESLIB1TARGETN): \ HIDRES2PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB2NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB2HIDFILESx=$(shell @+echo $(RESLIB2SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB2HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB2SRSFILES))) $(HIDRES2PARTICLE): $(RESLIB2HIDFILES) @echo ------------------------------ @@ -103,7 +101,7 @@ $(RSC_MULTI2) : \ $(RESLIB2SRSFILES) \ $(RESLIB2TARGETN) \ $(RESLIB2BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -164,7 +162,6 @@ $(RESLIB2TARGETN): \ HIDRES3PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB3NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB3HIDFILESx=$(shell @+echo $(RESLIB3SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB3HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB3SRSFILES))) $(HIDRES3PARTICLE): $(RESLIB3HIDFILES) @echo ------------------------------ @@ -182,7 +179,7 @@ $(RSC_MULTI3) : \ $(RESLIB3SRSFILES) \ $(RESLIB3TARGETN) \ $(RESLIB3BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -243,7 +240,6 @@ $(RESLIB3TARGETN): \ HIDRES4PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB4NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB4HIDFILESx=$(shell @+echo $(RESLIB4SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB4HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB4SRSFILES))) $(HIDRES4PARTICLE): $(RESLIB4HIDFILES) @echo ------------------------------ @@ -261,7 +257,7 @@ $(RSC_MULTI4) : \ $(RESLIB4SRSFILES) \ $(RESLIB4TARGETN) \ $(RESLIB4BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -322,7 +318,6 @@ $(RESLIB4TARGETN): \ HIDRES5PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB5NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB5HIDFILESx=$(shell @+echo $(RESLIB5SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB5HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB5SRSFILES))) $(HIDRES5PARTICLE): $(RESLIB5HIDFILES) @echo ------------------------------ @@ -340,7 +335,7 @@ $(RSC_MULTI5) : \ $(RESLIB5SRSFILES) \ $(RESLIB5TARGETN) \ $(RESLIB5BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -401,7 +396,6 @@ $(RESLIB5TARGETN): \ HIDRES6PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB6NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB6HIDFILESx=$(shell @+echo $(RESLIB6SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB6HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB6SRSFILES))) $(HIDRES6PARTICLE): $(RESLIB6HIDFILES) @echo ------------------------------ @@ -419,7 +413,7 @@ $(RSC_MULTI6) : \ $(RESLIB6SRSFILES) \ $(RESLIB6TARGETN) \ $(RESLIB6BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -480,7 +474,6 @@ $(RESLIB6TARGETN): \ HIDRES7PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB7NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB7HIDFILESx=$(shell @+echo $(RESLIB7SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB7HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB7SRSFILES))) $(HIDRES7PARTICLE): $(RESLIB7HIDFILES) @echo ------------------------------ @@ -498,7 +491,7 @@ $(RSC_MULTI7) : \ $(RESLIB7SRSFILES) \ $(RESLIB7TARGETN) \ $(RESLIB7BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -559,7 +552,6 @@ $(RESLIB7TARGETN): \ HIDRES8PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB8NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB8HIDFILESx=$(shell @+echo $(RESLIB8SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB8HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB8SRSFILES))) $(HIDRES8PARTICLE): $(RESLIB8HIDFILES) @echo ------------------------------ @@ -577,7 +569,7 @@ $(RSC_MULTI8) : \ $(RESLIB8SRSFILES) \ $(RESLIB8TARGETN) \ $(RESLIB8BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -638,7 +630,6 @@ $(RESLIB8TARGETN): \ HIDRES9PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB9NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB9HIDFILESx=$(shell @+echo $(RESLIB9SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB9HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB9SRSFILES))) $(HIDRES9PARTICLE): $(RESLIB9HIDFILES) @echo ------------------------------ @@ -656,7 +647,7 @@ $(RSC_MULTI9) : \ $(RESLIB9SRSFILES) \ $(RESLIB9TARGETN) \ $(RESLIB9BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ @@ -717,7 +708,6 @@ $(RESLIB9TARGETN): \ HIDRES10PARTICLE=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(MISC))$/$(RESLIB10NAME)_res.hid #HACK cut off the dirty srs files which are included from solver -#RESLIB10HIDFILESx=$(shell @+echo $(RESLIB10SRSFILES:t"\n") | $(GREP) -v "$(SOLARRESDIR:s/\/\\/)" ) RESLIB10HIDFILES:=$(subst,$(OUTPATH),$(COMMON_OUTDIR) $(subst,.srs,_srs.hid $(RESLIB10SRSFILES))) $(HIDRES10PARTICLE): $(RESLIB10HIDFILES) @echo ------------------------------ @@ -735,7 +725,7 @@ $(RSC_MULTI10) : \ $(RESLIB10SRSFILES) \ $(RESLIB10TARGETN) \ $(RESLIB10BMPS) - @+echo using rsc multi-res feature + @echo using rsc multi-res feature .IF "$(common_build_reslib)"!="" $(RSC) -presponse @$(mktmp \ -r -p \ -- cgit