# HG changeset patch
# User James Aley <jamesa@symbian.org>
# Date 1276696602 -3600
# Node ID 9cd75f35e6e449b499679111c2141c070924ea81
# Parent  46a9400b839e57bebe7d383c669dea5a08cbd2a7
Fix for Bug 2950

diff -r 46a9400b839e -r 9cd75f35e6e4 apengine/apeng/group/APEngine.MMP
--- a/apengine/apeng/group/APEngine.MMP	Tue Jun 15 14:09:51 2010 +0100
+++ b/apengine/apeng/group/APEngine.MMP	Wed Jun 16 14:56:42 2010 +0100
@@ -73,7 +73,7 @@
 LIBRARY		Vpnapi.lib
 LIBRARY     centralrepository.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../EABI/ApEngine_EKA2.def
 #elif defined( WINSCW )
     DEFFILE ../BWinsCw/ApEngine_EKA2.def
diff -r 46a9400b839e -r 9cd75f35e6e4 apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp
--- a/apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -93,7 +93,7 @@
 LIBRARY centralrepository.lib
 
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../EABI/ApSettingsHandlerUI_EKA2.def
 #elif defined( WINSCW )
     DEFFILE ../BWinsCw/ApSettingsHandlerUI_EKA2.def
diff -r 46a9400b839e -r 9cd75f35e6e4 cmmanager/cmmgr/cmmapi/group/cmmapi.mmp
--- a/cmmanager/cmmgr/cmmapi/group/cmmapi.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/cmmanager/cmmgr/cmmapi/group/cmmapi.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -58,7 +58,7 @@
 
 DEBUGLIBRARY    flogger.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE ../EABI/CmManager_prot_setup.def
 #elif defined( WINSCW )
 DEFFILE ../BWinsCw/CmManager_prot_setup.def
diff -r 46a9400b839e -r 9cd75f35e6e4 cmmanager/cmmgr/cmmpluginbase/group/cmmpluginbase.mmp
--- a/cmmanager/cmmgr/cmmpluginbase/group/cmmpluginbase.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/cmmanager/cmmgr/cmmpluginbase/group/cmmpluginbase.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -53,7 +53,7 @@
 LIBRARY     efsrv.lib
 LIBRARY     hbcore.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../EABI/cmmpluginbase.def
 #else
     DEFFILE ../BWinsCw/cmmpluginbase.def
diff -r 46a9400b839e -r 9cd75f35e6e4 cmmanager/cmmgr/database/group/cmmanagerdatabase.mmp
--- a/cmmanager/cmmgr/database/group/cmmanagerdatabase.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/cmmanager/cmmgr/database/group/cmmanagerdatabase.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -47,7 +47,7 @@
 //LIBRARY         flogger.lib
 
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../eabi/cmmanagerdatabase.def
 #elif defined( WINSCW )
     DEFFILE ../bwinscw/cmmanagerdatabase.def
diff -r 46a9400b839e -r 9cd75f35e6e4 connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp
--- a/connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -78,7 +78,7 @@
 
 DEBUGLIBRARY    flogger.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE ../EABI/ConnMon_EKA2.def
 #elif defined( WINSCW )
 DEFFILE ../BWINSCW/CONNMON_EKA2.def
diff -r 46a9400b839e -r 9cd75f35e6e4 connectionmonitoring/connmonext/group/ConnMonExt.mmp
--- a/connectionmonitoring/connmonext/group/ConnMonExt.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionmonitoring/connmonext/group/ConnMonExt.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -36,7 +36,7 @@
 LIBRARY         connmon.lib
 DEBUGLIBRARY    flogger.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../EABI/ConnMonExt_EKA2.def
 #elif defined( WINSCW )
     DEFFILE ../BWinsCw/CONNMONEXT_EKA2.def
diff -r 46a9400b839e -r 9cd75f35e6e4 connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp
--- a/connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/ConnUiUtilsNotif.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -114,7 +114,7 @@
 LIBRARY     HbCore.lib
 LIBRARY     HbWidgets.lib
 
-#if defined(ARMCC)
+#if defined(EABI)
 DEFFILE ../ConnectionUiUtilities/EABI/ConnUiUtilsNotif.DEF
 #elif defined( WINSCW )
     DEFFILE ../ConnectionUiUtilities/BWinsCw/ConnUiUtilsNotif.DEF
diff -r 46a9400b839e -r 9cd75f35e6e4 connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp
--- a/connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/ConnectionUiUtilities.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -82,7 +82,7 @@
 DEBUGLIBRARY flogger.lib
 
 
-#if defined( ARMCC )
+#if defined( EABI )
 
 DEFFILE ../ConnectionUiUtilities/EABI/ConnectionUiUtilities_PROT.def
 
diff -r 46a9400b839e -r 9cd75f35e6e4 connectionutilities/ConnectionDialogs/group/DisconnectDlg.mmp
--- a/connectionutilities/ConnectionDialogs/group/DisconnectDlg.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/DisconnectDlg.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -87,7 +87,7 @@
 DEBUGLIBRARY efsrv.lib
 
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../DisconnectDlg/EABI/DisconnectDlg.DEF
 #elif defined( WINSCW )
     DEFFILE ../DisconnectDlg/BWinsCw/DISCONNECTDLG.def
diff -r 46a9400b839e -r 9cd75f35e6e4 connectionutilities/ConnectionDialogs/group/DisconnectDlgClient.mmp
--- a/connectionutilities/ConnectionDialogs/group/DisconnectDlgClient.mmp	Tue Jun 15 14:09:51 2010 +0100
+++ b/connectionutilities/ConnectionDialogs/group/DisconnectDlgClient.mmp	Wed Jun 16 14:56:42 2010 +0100
@@ -50,7 +50,7 @@
 
 
 
-#if defined(ARMCC)
+#if defined(EABI)
     DEFFILE ../DisconnectDlg/EABI/DISCONNECTDLGCLIENT.def
 #elif defined( WINSCW )
     DEFFILE ../DisconnectDlg/BWinsCw/DISCONNECTDLGCLIENT.def