2 files changed, 12 insertions, 7 deletions

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index b0dfb41..607819d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -155,7 +155,7 @@ void cmMakefile::Print() const
 
 bool cmMakefile::CommandExists(const char* name) const
 {
-  return m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->CommandExists(name);
+  return this->GetCMakeInstance()->CommandExists(name);
 }
 
 bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
@@ -170,7 +170,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
   std::string name = lff.m_Name;
   // execute the command
   cmCommand *rm = 
-    m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->GetCommand(name.c_str());
+    this->GetCMakeInstance()->GetCommand(name.c_str());
   if(rm)
     {
     cmCommand* usedCommand = rm->Clone();
@@ -349,7 +349,7 @@ bool cmMakefile::ReadListFile(const char* filename, const char* external)
 
 void cmMakefile::AddCommand(cmCommand* wg)
 {
-  m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->AddCommand(wg);
+  this->GetCMakeInstance()->AddCommand(wg);
 }
 
   // Set the make file 
@@ -1497,12 +1497,12 @@ cmVariableWatch *cmMakefile::GetVariableWatch() const
 
 cmCacheManager *cmMakefile::GetCacheManager() const
 {
-  return m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->GetCacheManager();
+  return this->GetCMakeInstance()->GetCacheManager();
 }
 
 bool cmMakefile::GetLocal() const
 {
-  return m_LocalGenerator->GetGlobalGenerator()->GetCMakeInstance()->GetLocal();
+  return this->GetCMakeInstance()->GetLocal();
 }
 void cmMakefile::DisplayStatus(const char* message, float s)
 {
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index 558066b..e0cf827 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -31,6 +31,7 @@ class cmLocalGenerator;
 class cmMakeDepend;
 class cmSourceFile;
 class cmVariableWatch;
+class cmake;
 
 /** \class cmMakefile
  * \brief Process the input CMakeLists.txt file.
@@ -532,7 +533,6 @@ public:
    * given a current CMakeLists file name
    */
   cmCacheManager *GetCacheManager() const;
-  cmake *GetCMakeInstance() const;
   cmVariableWatch* GetVariableWatch() const;
 
   //! Determine wether this is a local or global build.
@@ -608,7 +608,12 @@ private:
   void PrintStringVector(const char* s, const std::vector<std::string>& v) const;
   void AddDefaultDefinitions();
   std::list<cmFunctionBlocker *> m_FunctionBlockers;
-  
+
+  /**
+   * Get the instance
+   */ 
+  cmake *GetCMakeInstance() const;
+
   typedef std::map<cmStdString, cmData*> DataMap;
   DataMap m_DataMap;
   bool m_Inheriting;