--- a/skins/AknSkinContent/group/skingenerator.flm	Thu Aug 19 10:53:51 2010 +0300
+++ b/skins/AknSkinContent/group/skingenerator.flm	Tue Aug 31 16:13:36 2010 +0300
@@ -26,7 +26,6 @@
 # AKNSSKINNAME
 # AKNSSKINREALNAME
 # AKNSSKINUID
-# INPUTBMPS (to be specified in the bld.inf as 'no' if it doesn't has bmps as input); by default assumes that it uses bmps as input
 
 CREATABLEPATHS:=
 CLEANTARGETS:=
@@ -85,26 +84,19 @@
 
 define generatesknandmif
 $(SKNMIFGUARD):=1
-RELEASEABLES:=$(TARGETSKN) $(TARGETMIF)
-ifeq ($(INPUTBMPS),yes)
-RELEASEABLES:=$(RELEASEABLES) $(basename $(TARGETMIF)).mbm
-endif
+RELEASEABLES:=$(TARGETSKN) $(TARGETMIF) $(basename $(TARGETMIF)).mbm
 
 BITMAP:: $(TARGETMIF)
 
 $(TARGETMIF) : $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif
-	$(call startrule,mifskncopy,FORCESUCCESS) \
+	$(call startrule,mifmbmcopy,FORCESUCCESS) \
 	$(GNUCP) $$< $$@ && \
 	$(GNUCHMOD) a+rw "$$@" && \
+	$(GNUCP) $$(basename $$<).mbm $$(basename $$@).mbm && \
+	$(GNUCHMOD) a+rw "$$(basename $$@).mbm" && \
 	$(GNUCP) $$(basename $$<).skn $(TARGETSKN) && \
 	$(GNUCHMOD) a+rw "$(TARGETSKN)" \
-	$(call endrule,mifskncopy)
-ifeq ($(INPUTBMPS),yes)
-	$(call startrule,mbmcopy,FORCESUCCESS) \
-	$(GNUCP) $$(basename $$<).mbm $$(basename $$@).mbm && \
-	$(GNUCHMOD) a+rw "$$(basename $$@).mbm" \
-	$(call endrule,mbmcopy)
-endif
+	$(call endrule,mifmbmcopy)
 
 $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).skn : $(SKINCOMPILER) $(AKNSSRCDIR)/$(AKNSSKINNAME).txt
 	$(call startrule,generateskn,FORCESUCCESS) \
@@ -112,26 +104,17 @@
 	$(call endrule,generateskn)
 
 #Add the temporary files to the cleanlist
-CLEANTARGETS:=$$(CLEANTARGETS) $(addprefix $(AKNSDATAGENDIR)/,$(addprefix $(AKNSSKINREALNAME),.skn .pkg _MIFList.txt))
+CLEANTARGETS:=$$(CLEANTARGETS) $(addprefix $(AKNSDATAGENDIR)/,$(addprefix $(AKNSSKINREALNAME),.skn .pkg _MIFlist.txt))
 
 $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif : $(MIFTOOL) $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).skn
 	$(call startrule,generatemif,FORCESUCCESS)\
 	cd $(AKNSSRCDIR) && \
 	$(MIFTOOL) $(AKNSSKINREALNAME).mif -F$(AKNSDATAGENDIR)/$(AKNSSKINREALNAME)_MIFList.txt && \
-	$(GNUCP) $(AKNSSKINREALNAME).mif $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif \
-	$(call endrule,generatemif)
-ifeq ($(INPUTBMPS),yes)
-	$(call startrule,copymbm2generatedfolder,FORCESUCCESS)\
-	cd $(AKNSSRCDIR) && \
+	$(GNUCP) $(AKNSSKINREALNAME).mif $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif && \
 	$(GNUCP) $(AKNSSKINREALNAME).mbm $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mbm \
-	$(call endrule,copymbm2generatedfolder)
-endif	
-	
+	$(call endrule,generatemif)
 
-CLEANTARGETS:=$$(CLEANTARGETS) $$(RELEASEABLES) $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mif
-ifeq ($(INPUTBMPS),yes)
-CLEANTARGETS:=$$(CLEANTARGETS) $(AKNSDATAGENDIR)/$(AKNSSKINREALNAME).mbm
-endif
+CLEANTARGETS:=$$(CLEANTARGETS) $$(RELEASEABLES) $(addprefix $(AKNSDATAGENDIR)/,$(addprefix $(AKNSSKINREALNAME).,mif mbm))
 endef
 
 ifeq ($($(SKNMIFGUARD)),)