diff -r 17733b82d643 -r e6381a1f4952 sbsv2/raptor/lib/flm/resource.flm
--- a/sbsv2/raptor/lib/flm/resource.flm	Mon May 10 19:06:11 2010 +0100
+++ b/sbsv2/raptor/lib/flm/resource.flm	Tue May 11 13:33:47 2010 +0100
@@ -118,25 +118,7 @@
     # files etc.  In the end don't print anything at all if we did not find the target.
 
 define  DEPENDENCY_CORRECTOR
-{ set +x; $(GNUSED) -rn '\% ([^ /]+)\.((rsg)|(mbg))%I {y%\\\\%\\/%;p;}'  |  \
-    { \
-    ENDL='\\\\\n'; \
-    DEPTXT="$$$$RPP: $$$${ENDL}" ; \
-    DEPCOUNT=0; \
-    DEPS=''; read L; \
-    while [ $$$$? -eq 0 ]; do \
-        for i in $$$${L}; do \
-          if [[ ( "$$$${i%%.[Rr][Ss][Gg]}" != "$$$$i"  || "$$$${i%%.[Mm][Bb][Gg]}" != "$$$$i" ) && ( "$$$${i:1:1}" != ':' && "$$$${i:0:1}" != '/' ) ]];  then \
-            DEPTXT="$$$$DEPTXT \$$$$(EPOCROOT)/epoc32/include/$$$$i $$$${ENDL}"; \
-            (( DEPCOUNT += 1 )) ; \
-          fi; \
-        done; \
-      read L; \
-    done; \
-    if [ $$$$DEPCOUNT -ne 0 ]; then  \
-      echo -e "$$$${DEPTXT:0:$$$$[ $$$${#DEPTXT} - 4 ]}\n"; fi ;\
-  } ;\
-} 
+{ $(DEPCRUNCH) --extensions rsg,mbg --assume '$$$$(EPOCROOT)/epoc32/include' ; } 
 endef
 
 else