--- a/appfw/apparchitecture/group/APLIST.MMP	Thu Aug 19 10:05:08 2010 +0300
+++ b/appfw/apparchitecture/group/APLIST.MMP	Tue Aug 31 15:24:25 2010 +0300
@@ -32,18 +32,18 @@
 
 option MSVC /Od
 
+
 SOURCEPATH	../aplist
 
 userinclude	../inc
 MW_LAYER_SYSTEMINCLUDE_SYMBIAN
 
-source		aplapplist.cpp	aplapplistitem.cpp aplappinforeader.cpp aplappregfinder.cpp apsidchecker.cpp
+source		aplapplist.cpp	aplapplistitem.cpp aplappinforeader.cpp apsidchecker.cpp
 source		apsiconcaptionoverride.cpp
-// source       APGCTL.CPP apgdoor.cpp APGICNFL.CPP APGSTD.CPP APGTASK.CPP
-// source	APGWGNAM.CPP apgcli.cpp apgstart.cpp apgrecog.cpp APGPRIV.CPP
-// source	apgnotif.cpp APGAIR.CPP APGAIRV2.CPP APSCLI.CPP APGCONSTDATA.CPP
-// SOURCE	apsecutils.cpp
-// source       APGAPLSTV2.CPP
+
+#ifndef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+source aplappregfinder.cpp
+#endif
 
 library         euser.lib gdi.lib estor.lib efsrv.lib fbscli.lib
 library         bitgdi.lib ws32.lib bafl.lib ecom.lib 
@@ -59,10 +59,13 @@
 library 		apmime.lib 	// TDataType referenced from CApaAppData
 library			centralrepository.lib
 
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+library			scrclient.lib
+#endif
+
 //library         	apserv.lib apfile.lib apparc.lib 
 
 #ifdef USE_IH_RAISE_EVENT
-APP_LAYER_SYSTEMINCLUDE_SYMBIAN
 LIBRARY			instrumentationhandler.lib
 #endif // USE_IH_RAISE_EVENT
 
@@ -76,4 +79,12 @@
 START MARM
 END
 
+#ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK
+	deffile aplist.def
+#else
+	deffile aplist_legacy.def
+#endif
+
+
+
 SMPSAFE