--- a/activityfw/activityserviceplugin/activityserviceplugin.pro	Tue Jul 06 14:37:10 2010 +0300
+++ b/activityfw/activityserviceplugin/activityserviceplugin.pro	Wed Aug 18 10:05:49 2010 +0300
@@ -15,37 +15,59 @@
 #
 
 TEMPLATE = lib
-TARGET = activityserviceplugin
+TARGET = afservice
 
 CONFIG += plugin 
 include(activityserviceplugin.pri)
 
+DEFINES += AFACTIVITIES_LIB
+
 INCLUDEPATH += ./inc \
-               ../../inc
+               ../inc \
+
+HEADERS +=  ./inc/afserviceplugin.h \
+            ./inc/afclient.h \
+            ./inc/afmanager.h \
+            ./inc/afactivitystorage_p.h \
+            ./inc/afactivation_p.h \
+            ./inc/afcommandlineparser.h \
+            ./inc/afstorageproxy.h \
 
-HEADERS +=  ./inc/activityserviceplugin.h \
-            ./inc/afactivityclient.h \
-            ./inc/afactivitymanager.h \
-            ./inc/applicationlauncher.h \
+HEADERS +=  ../../homescreensrv_plat/activity_framework_api/afactivities_global.h \
+            ../../homescreensrv_plat/activity_framework_api/afactivitystorage.h \
+            ../../homescreensrv_plat/activity_framework_api/afactivation.h \
 
-SOURCES +=  ./src/activityserviceplugin.cpp \
-            ./src/afactivityclient.cpp \
-            ./src/afactivitymanager.cpp \
-            ./src/applicationlauncher.cpp \
+SOURCES +=  ./src/afserviceplugin.cpp \
+            ./src/afclient.cpp \
+            ./src/afmanager.cpp \
+            ./src/aflauncher.cpp \
+            ./src/afactivitystorage.cpp \
+            ./src/afactivitystorage_p.cpp \
+            ./src/afactivation.cpp \
+            ./src/afactivation_p.cpp \
+            ./src/afcommandlineparser.cpp \
+            ./src/afstorageproxy.cpp \
 
 symbian {
     INCLUDEPATH += ./s60/inc \
 
-    SOURCES += ./s60/src/applicationlauncher_p.cpp
+    SOURCES +=  ./s60/src/applicationlauncher_p.cpp \
+                ./s60/src/afstorageproxy_p.cpp \
+                ./s60/src/afserializer.cpp \
     
-    HEADERS += ./s60/inc/applicationlauncher_p.h
+    HEADERS +=  ./s60/inc/applicationlauncher_p.h \
+                ./s60/inc/afstorageproxy_p.h \
+                ./s60/inc/afserializer.h \
 
     LIBS += -lapparc \
             -lapgrfx \
             -lcone \
             -lafstorageclient \
-            -lxqutils
- 
+            -lxqutils \
+            -lafstoragecommon.lib \
+            -lestor \
+            -lfbscli \
+
 }
 
 win32 {
@@ -62,15 +84,27 @@
     TARGET.CAPABILITY = ALL -TCB
     TARGET.UID3 = 0x200267B2
 
-    plugin.sources = activityserviceplugin.dll
+    plugin.sources = afservice.dll
     plugin.path = $$QT_PLUGINS_BASE_DIR     
     
-    xml.sources = ./data/activityserviceplugin.xml
+    xml.sources = ./data/afservice.xml
     xml.path = $$RESOURCE_FILES_DIR/activity
     
     DEPLOYMENT += xml
 
     #temporary workaround
-    BLD_INF_RULES.prj_exports += "data/activityserviceplugin.xml z:/resource/activity/activityserviceplugin.xml"
+    BLD_INF_RULES.prj_exports += "data/afservice.xml z:/resource/activity/afservice.xml"
+    
+    #export xml with old name (remove after next release)
+    BLD_INF_RULES.prj_exports += "data/afservice.xml z:/resource/activity/activityserviceplugin.xml"
+    BLD_INF_RULES.prj_exports += "data/afservice.xml $$QT_PLUGINS_BASE_DIR/activityserviceplugin.xml"    
     
+    # we want to export few classes, use standard .def block instead of the one generated by plugin
+    defBlock = \
+        "$${LITERAL_HASH}ifdef WINSCW" \
+        "DEFFILE ./bwins/$${TARGET}.def" \
+        "$${LITERAL_HASH}elif defined EABI" \
+        "DEFFILE ./eabi/$${TARGET}.def" \
+        "$${LITERAL_HASH}endif"
+    MMP_RULES += defBlock
 }