diff -r 6465d5bb863a -r 58cebe0861a8 controlpanel/src/cpframework/cpframework.pro
--- a/controlpanel/src/cpframework/cpframework.pro	Fri Jun 25 17:09:30 2010 +0800
+++ b/controlpanel/src/cpframework/cpframework.pro	Tue Aug 24 10:30:25 2010 +0800
@@ -18,7 +18,6 @@
 TARGET = cpframework
 
 include ( ../common.pri )
-include ( ../logger/logger.pri)
 include ( ./cpframework.pri )
 include ( ../../controlpanel_plat/inc/controlpanel_plat.pri )
 
@@ -29,27 +28,10 @@
 }
 
 CONFIG += Hb xml
-DEFINES += BUILD_CP_FRAMEWORK BUILD_LOGGER_DLL
-                    
-symbian: {  
-    # export headers to mw
-    EXPORT_PLATFORM_HEADERS += \
-                             ../../controlpanel_plat/inc/cpglobal.h \
-                             ../../controlpanel_plat/inc/cpbasepath.h \
-                             ../../controlpanel_plat/inc/cpplugininterface.h \
-                             ../../controlpanel_plat/inc/cppluginplatinterface.h \
-                             ../../controlpanel_plat/inc/cppluginloader.h \
-                             ../../controlpanel_plat/inc/cppluginlauncher.h \
-                             ../../controlpanel_plat/inc/cpbasesettingview.h \
-                             ../../controlpanel_plat/inc/cpitemdatahelper.h \
-                             ../../controlpanel_plat/inc/cpsettingformitemdata.h \
-                             ../../controlpanel_plat/inc/cpsettingformentryitemdata.h \
-                             ../../controlpanel_plat/inc/cpsettingformentryitemdataimpl.h \
-                             ../../controlpanel_plat/inc/cppluginutility.h \
-                             ../../controlpanel_plat/inc/cplauncherinterface.h
+
+DEFINES += BUILD_CP_FRAMEWORK
+
+LIBS += -lcplogger
+                   
+include ( cpframework_export.pri )
     
-    headers.sources = $$EXPORT_PLATFORM_HEADERS
-    for(header, headers.sources):BLD_INF_RULES.prj_exports += "./$$header $$MW_LAYER_PLATFORM_EXPORT_PATH($$basename(header))"
-}
-include (../logger/logger_export.pri)
-