--- a/sbsv2/raptor/RELEASE-NOTES.html	Tue May 18 20:42:35 2010 +0100
+++ b/sbsv2/raptor/RELEASE-NOTES.html	Tue May 18 22:13:09 2010 +0100
@@ -10,6 +10,7 @@
 
 <h3>Defect Fixes</h3>
 <ul>
+<li>Fix : tracecompiler.mk caused poor makefile parse performance due to use of $(shell)</li>
 <li><a href="http://developer.symbian.org/bugs/show_bug.cgi?id=2561"> SF Bug 2561 </a> - [Raptor] creates incorrect .iby files w.r.t target file versions &amp; ramtargets</li>
 </ul>
 

--- a/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue May 18 20:42:35 2010 +0100
+++ b/sbsv2/raptor/lib/flm/tracecompiler.mk	Tue May 18 22:13:09 2010 +0100
@@ -79,7 +79,7 @@
 # $2 = ">" or ">>" i.e. for creating the file.
 define sourcelist_grouped_write
 	$(call startrule,sourcelist_write) \
-	$(if $1,echo -en '$(subst $(CHAR_SPACE),\n,$(strip $(wordlist 1,10,$1)))\n' $2 $$@,true;echo $1) \
+	$(if $1,echo -en '$(subst $(CHAR_SPACE),\n,$(strip $(wordlist 1,10,$1)))\n' $2 $$@,true) \
 	$(call endrule,sourcelist_write) 
 	$(if $1,$(call sourcelist_grouped_write,$(wordlist 11,$(words $1),$1),>>),)
 endef
@@ -186,7 +186,7 @@
 $(TRACE_SOURCE_LIST):
 	$(call startrule,sourcelist_combine) \
 	$(GNUCAT) $$^ | $(GNUSORT) -u > $$@.new && \
-	$(GNUMD5SUM) -c $(TRACE_MARKER) ||  \
+	$(GNUMD5SUM) -c $(TRACE_MARKER) 2>/dev/null ||  \
 	  $(GNUCP) $$@.new $$@ \
 	$(call endrule,sourcelist_combine)
 
@@ -196,7 +196,7 @@
 	  $(GNUCAT) $(TRACE_SOURCE_LIST); \
 	  echo -en "*ENDOFSOURCEFILES*\n" ) | \
 	$(JAVA_COMMAND) $(TRACE_COMPILER_START) $(UID_TC) &&  \
-	$(GNUMD5SUM) $(TRACE_SOURCE_LIST).new > $$@ && \
+	$(GNUMD5SUM) $(TRACE_SOURCE_LIST).new > $$@ 2>/dev/null && \
 	{ $(GNUTOUCH) $(TRACE_DICTIONARY) $(AUTOGEN_HEADER); \
 	 $(GNUCAT) $(TRACE_SOURCE_LIST) ; true ; } \
 	$(call endrule,tracecompile)