--- a/graphicscomposition/openwfcompositionengine/group/openwfc.mmp	Wed May 19 14:34:22 2010 +0100
+++ b/graphicscomposition/openwfcompositionengine/group/openwfc.mmp	Tue Jun 01 15:04:40 2010 +0100
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
 // under the terms of "Eclipse Public License v1.0"
@@ -11,87 +11,18 @@
 // Contributors:
 //
 // Description:
-// libWFC.dll OpenWFC Sample Implementation
-// 
+// OpenWFC Sample Implementation
+//
 //
 
-#include <WF/openwfcuids.hrh>
 
 //macros to enable filtering debug log output.
-//DEBUG_LOG must also be defined to enable logging 
+//DEBUG_LOG must also be defined to enable logging
 //(automatic if _DEBUG is defined, and DEBUG_DONOT_LOG is not defined)
 MACRO DEBUG_DONOT_LOG
 //MACRO DEBUG_LOG_FUNCTION=WFC_Element_
 //MACRO DEBUG_LOG_FILE=owfnotifications.c
 
-TARGET			libWFC.dll
-NOEXPORTLIBRARY
-EPOCALLOWDLLDATA 
-
-#ifdef WINS
-deffile SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(def/win32/libWFC.def)
-#else
-deffile SYMBIAN_OS_LAYER_PLATFORM_EXPORT_PATH(def/eabi/libWFC.def)
-#endif
-
-MACRO			__KHR_EXPORTS
-TARGETTYPE		dll
-CAPABILITY		PowerMgmt ReadDeviceData WriteDeviceData ProtServ
-UID				0 KUidOpenWfcDllUidValue
-
-OS_LAYER_SYSTEMINCLUDE_SYMBIAN
-OS_LAYER_LIBC_SYSTEMINCLUDE
-MACRO		HG_NO_ALLOCA_H
-MACRO		EGL_DLL
-
-USERINCLUDE		../composition/include
-USERINCLUDE		../common/include
-USERINCLUDE		../adaptation/include
-
-LIBRARY			libEGL.lib
-LIBRARY			euser.lib
-LIBRARY			libc.lib
-LIBRARY			libpthread.lib
-LIBRARY			libm.lib
-LIBRARY			hal.lib
-LIBRARY			wfcinterop.lib
-LIBRARY			surfacemanager.lib
+#include "openwfc.mmh"
 
-SOURCEPATH	../composition/src
-SOURCE			wfcapi.c 
-SOURCE			wfccontext.c
-SOURCE			wfcdevice.c
-SOURCE			wfcelement.c
-SOURCE			wfcimageprovider.c
-SOURCE			wfcscene.c
-SOURCE			wfcpipeline.c
-
-SOURCEPATH	../common/src
-SOURCE			owfarray.c
-SOURCE			owfattributes.c
-SOURCE			owfdebug.c
-SOURCE			owfimage.c
-SOURCE			owflinkedlist.c
-SOURCE			owfmemory.c
-SOURCE			owfobject.c
-SOURCE			owfpool.c
-SOURCE			owfutils.c
-
-SOURCEPATH	../adaptation/src/Platform/OS/symbian
-SOURCE			owfconsole.cpp
-SOURCE			owfmessagequeue.c
-SOURCE			owfmutex.c
-SOURCE			owfsemaphore.c
-SOURCE			owfthread.c
-SOURCE			owfextensions.cpp
-
-SOURCEPATH ../adaptation/src/Platform/Graphics/symbian
-SOURCE			owfdisplaycontext.cpp
-SOURCE 			owfscreen_displaychannel.cpp
-SOURCE 			owfnativestreamstub.cpp
-SOURCE 			owfnotifications.cpp
-
-
-
-SMPSAFE
-
+TARGET                 libWFC.dll