--- a/wlanutilities/wpswizard/wpswizard.pro	Thu Jun 10 15:44:54 2010 +0300
+++ b/wlanutilities/wpswizard/wpswizard.pro	Thu Jun 24 10:49:51 2010 +0300
@@ -10,50 +10,66 @@
 # Nokia Corporation - initial contribution.
 #
 # Contributors:
-# Description: 
 #
+# Description: WPS wizard 
+#
+
 
 TEMPLATE = lib
 TARGET = wpswizard
 DEFINES += BUILD_WPS_WIZARD_DLL
 VERSION = 0.0.1
 CONFIG += hb
-MOC_DIR = _moc
-RCC_DIR = _resources
-RESOURCES += resources/resource.qrc
-TRANSLATIONS += resources/wpswizardplugin.ts
-HEADERS += ../inc/wpswizard.h \
+MOC_DIR = build
+RCC_DIR = build
+RESOURCES += resources/wpswizard_resource.qrc
+TRANSLATIONS += wpswizardplugin.ts
+
+INCLUDEPATH += inc \
+        ../inc
+
+HEADERS += inc/wpswizard.h \
     inc/wpswizard_p.h \
     inc/wpswizardpage.h \
     inc/wpswizardsteptwo.h \
     inc/wpswizardstepthreebutton.h \
     inc/wpswizardstepthreenumber.h \
     inc/wpswizardstepfour.h \
+    inc/wpswizardstepfour_p.h \
     inc/wpswizardstepfive.h \
     inc/cwpsactiverunner.h \
     inc/mwpsactiverunnercallback.h \
-    traces/OstTraceDefinitions.h
-SOURCES += src/wpswizardprivate.cpp \
+    
+SOURCES += src/wpswizard_p.cpp \
     src/wpswizard.cpp \
     src/wpswizardpage.cpp \
     src/wpswizardsteptwo.cpp \
     src/wpswizardstepthreebutton.cpp \
     src/wpswizardstepthreenumber.cpp \
     src/wpswizardstepfour.cpp \
+    src/wpswizardstepfour_p.cpp \
     src/wpswizardstepfive.cpp \
     src/cwpsactiverunner.cpp
-LIBS += -lecom
+    
+
 symbian { 
-    HEADERS += 
-    SOURCES += 
-    INCLUDEPATH += inc \
-        ../../inc \
-        ../wlanwizard/inc \
-        $$MW_LAYER_SYSTEMINCLUDE \
-        $$OS_LAYER_SYSTEMINCLUDE
+
+    LIBS += -lecom    
+        
     TARGET.UID3 = 0x2003D2FE
     TARGET.CAPABILITY = CAP_GENERAL_DLL
-    BLD_INF_RULES.prj_exports += "rom/wpswizard.iby CORE_MW_LAYER_IBY_EXPORT_PATH(wpswizard.iby)"
+    
     TARGET.EPOCALLOWDLLDATA = 1
-    MMP_RULES += EXPORTUNFROZEN
+        
+    MMP_RULES += "USERINCLUDE traces"
+    
+    # location of directories for def files
+    defFilePath = .
+    
+    BLD_INF_RULES.prj_exports += "rom/wpswizard.iby CORE_MW_LAYER_IBY_EXPORT_PATH(wpswizard.iby)"
+    BLD_INF_RULES.prj_exports += "rom/wpswizard_resources.iby LANGUAGE_APP_LAYER_IBY_EXPORT_PATH(wpswizard_resources.iby)"
+    BLD_INF_RULES.prj_exports += "inc/wpswizard.h |../inc/wpswizard.h"       
 }
+
+include (stubs/stubs.pri)
+