--- a/locationmanager/geotagger/group/geotagger.mmp	Tue Jul 06 14:44:37 2010 +0300
+++ b/locationmanager/geotagger/group/geotagger.mmp	Fri Sep 17 16:54:49 2010 +0300
@@ -28,7 +28,7 @@
 CAPABILITY 	    CAP_GENERAL_DLL
 
 #if defined(WINSCW)
-#elif defined(ARMCC)
+#elif defined(EABI)
 deffile ../eabi/geotaggerarm.def
 #endif
 nostrictdef
@@ -38,15 +38,15 @@
 USERINCLUDE     ../../../inc
 
 
-USERINCLUDE     ../../tagcreator/inc
-
 #ifdef     _LOC_GEOTAGGING_CELLID
 MACRO LOC_GEOTAGGING_CELLID
 USERINCLUDE     ../../geoconverter/inc
 #endif
 
-USERINCLUDE     ../../reversegeocode/inc
-USERINCLUDE	../../reversegeocoderplugin/inc
+#ifdef _LOC_REVERSEGEOCODE
+MACRO LOC_REVERSEGEOCODE
+USERINCLUDE     ../../tagcreator/inc
+#endif
 
 
 SOURCEPATH      ../src
@@ -66,18 +66,16 @@
 LIBRARY         estor.lib
 LIBRARY	        platformenv.lib
 
-DEBUGLIBRARY    flogger.lib
-LIBRARY         tagcreator.lib 
 LIBRARY         ecom.lib 
 LIBRARY	        libc.lib
 
-LIBRARY         reversegeocode.lib
-
-
 #ifdef     _LOC_GEOTAGGING_CELLID
 LIBRARY         geoconverter.lib
 #endif
 
+#ifdef _LOC_REVERSEGEOCODE
+LIBRARY        tagcreator.lib 
+#endif
 
 PAGED
 BYTEPAIRCOMPRESSTARGET