diff -r 0fd27995241b -r 9ac0a0a7da70 build/Makefile.comp
--- a/build/Makefile.comp	Tue May 11 16:07:20 2010 +0300
+++ b/build/Makefile.comp	Tue May 25 12:34:19 2010 +0300
@@ -98,6 +98,24 @@
 	echo SUBDIRS += $(TARGET_SUB)/$(PRO_FILE) >> $(TARGET_PRO)
 endif
 
+# The remove_notbuilt removes platform specific subdirectories not
+# participating in the built of current environment
+ifeq ($(BUILDENV),symbian)
+REMOVEWILDCARD = *.linux
+else
+REMOVEWILDCARD = *.s60
+endif
+REMOVEDIRECORIES = $(call PATHFIX,$(wildcard ../$(REMOVEWILDCARD)))
+remove_notbuilt:
+ifneq ($(REMOVEDIRECORIES),)
+ifdef SIMULATE
+	echo Remove not-built directories at $(CURDIR): $(REMOVEDIRECORIES)
+else
+	echo Removing not-built directories at $(CURDIR): $(REMOVEDIRECORIES) \
+	$(foreach d,$(REMOVEDIRECORIES),&& $(call DELTREE,$(d)))
+endif
+endif
+
 # Symbian ----------------------------------
 ifeq ($(BUILDENV),symbian)