--- a/locationmanager/locationtrail/group/locationtrail.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/locationtrail/group/locationtrail.mmp	Fri Sep 17 16:54:49 2010 +0300
@@ -29,7 +29,7 @@
 
 #if defined(WINSCW)
 deffile ../bwincw/locationtrailwinscw.def
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/locationtrailarm.def
 #endif
 nostrictdef
@@ -41,8 +41,6 @@
 #ifdef _LOC_REVERSEGEOCODE
 MACRO LOC_REVERSEGEOCODE
 USERINCLUDE     ../../tagcreator/inc
-USERINCLUDE     ../../ReverseGeocode/inc
-USERINCLUDE	../../ReverseGeoCoderPlugin/inc
 #endif
 
 #ifdef     _LOC_GEOTAGGING_CELLID
@@ -77,13 +75,11 @@
 LIBRARY         ecom.lib
 LIBRARY         commsdat.lib
 
+LIBRARY        geotagger.lib
+LIBRARY        libc.lib
 
-DEBUGLIBRARY flogger.lib
-LIBRARY        libc.lib
 #ifdef _LOC_REVERSEGEOCODE
-LIBRARY        reversegeocode.lib 
 LIBRARY        tagcreator.lib 
-LIBRARY        geotagger.lib
 #endif
 
 #ifdef     _LOC_GEOTAGGING_CELLID