Browse Source

ENH: fix warning

Ken Martin 20 years ago
parent
commit
dce07caf0b

+ 2 - 2
Source/cmGlobalUnixMakefileGenerator3.cxx

@@ -138,7 +138,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile()
                     depends,
                     no_commands);
 
-  lg->WriteMakeVariables(makefileStream, cmLocalGenerator::HOME_OUTPUT);
+  lg->WriteMakeVariables(makefileStream);
   
   lg->WriteSpecialTargetsTop(makefileStream);
 
@@ -205,7 +205,7 @@ void cmGlobalUnixMakefileGenerator3::WriteMainMakefile2()
                     "The main recursive all target", "all", 
                     no_commands, no_commands);
 
-  lg->WriteMakeVariables(makefileStream,cmLocalGenerator::HOME_OUTPUT);
+  lg->WriteMakeVariables(makefileStream);
   
   // write the target convenience rules
   unsigned int i;

+ 4 - 4
Source/cmLocalUnixMakefileGenerator3.cxx

@@ -304,7 +304,7 @@ cmLocalUnixMakefileGenerator3
     }
   this->WriteDisclaimer(ruleFileStream);
   
-  this->WriteMakeVariables(ruleFileStream, HOME_OUTPUT);
+  this->WriteMakeVariables(ruleFileStream);
   
   // Open the flags file.  This should be copy-if-different because the
   // rules may depend on this file itself.
@@ -738,7 +738,7 @@ cmLocalUnixMakefileGenerator3
     return;
     }
   this->WriteDisclaimer(ruleFileStream);
-  this->WriteMakeVariables(ruleFileStream, HOME_OUTPUT);
+  this->WriteMakeVariables(ruleFileStream);
   ruleFileStream
     << "# Utility rule file for " << target.GetName() << ".\n\n";
 
@@ -895,7 +895,7 @@ void cmLocalUnixMakefileGenerator3::WriteDivider(std::ostream& os)
 //----------------------------------------------------------------------------
 void
 cmLocalUnixMakefileGenerator3
-::WriteMakeVariables(std::ostream& makefileStream, RelativeRoot root)
+::WriteMakeVariables(std::ostream& makefileStream)
 {
   this->WriteDivider(makefileStream);
   makefileStream
@@ -2813,7 +2813,7 @@ void cmLocalUnixMakefileGenerator3::WriteLocalMakefile()
     }
   this->WriteDisclaimer(ruleFileStream);
 
-  this->WriteMakeVariables(ruleFileStream, START_OUTPUT);
+  this->WriteMakeVariables(ruleFileStream);
   
   this->WriteSpecialTargetsTop(ruleFileStream);
   

+ 1 - 1
Source/cmLocalUnixMakefileGenerator3.h

@@ -64,7 +64,7 @@ public:
                      const std::vector<std::string>& commands);
   
   // write the main variables used by the makefiles
-  void WriteMakeVariables(std::ostream& makefileStream, RelativeRoot root);
+  void WriteMakeVariables(std::ostream& makefileStream);
 
   // write a  comment line #====... in the stream
   void WriteDivider(std::ostream& os);