[cmake-commits] king committed cmMakefileExecutableTargetGenerator.cxx 1.35 1.36 cmMakefileLibraryTargetGenerator.cxx 1.44 1.45 cmMakefileTargetGenerator.cxx 1.65 1.66

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv7112

Modified Files:
	cmMakefileExecutableTargetGenerator.cxx 
	cmMakefileLibraryTargetGenerator.cxx 
	cmMakefileTargetGenerator.cxx 
Log Message:
ENH: Simplify makefile target generator listing of object files to clean.


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- cmMakefileLibraryTargetGenerator.cxx	1 Aug 2007 17:04:45 -0000	1.44
+++ cmMakefileLibraryTargetGenerator.cxx	2 Aug 2007 13:37:10 -0000	1.45
@@ -911,11 +911,7 @@
   // Write the main driver rule to build everything in this target.
   this->WriteTargetDriverRule(targetFullPath.c_str(), relink);
 
-  // Clean all the possible library names and symlinks and object files.
-  this->CleanFiles.insert(this->CleanFiles.end(),
-                          libCleanFiles.begin(),libCleanFiles.end()); 
+  // Clean all the possible library names and symlinks.
   this->CleanFiles.insert(this->CleanFiles.end(),
-                          this->Objects.begin(),
-                          this->Objects.end());
+                          libCleanFiles.begin(),libCleanFiles.end());
 }
-

Index: cmMakefileExecutableTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileExecutableTargetGenerator.cxx,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- cmMakefileExecutableTargetGenerator.cxx	28 May 2007 15:03:11 -0000	1.35
+++ cmMakefileExecutableTargetGenerator.cxx	2 Aug 2007 13:37:10 -0000	1.36
@@ -474,12 +474,8 @@
   // Write the main driver rule to build everything in this target.
   this->WriteTargetDriverRule(targetFullPath.c_str(), relink);
 
-  // Clean all the possible executable names and symlinks and object files.
+  // Clean all the possible executable names and symlinks.
   this->CleanFiles.insert(this->CleanFiles.end(),
                           exeCleanFiles.begin(),
                           exeCleanFiles.end());
-  this->CleanFiles.insert(this->CleanFiles.end(),
-                          this->Objects.begin(),
-                          this->Objects.end());
 }
-

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- cmMakefileTargetGenerator.cxx	18 Jun 2007 15:59:23 -0000	1.65
+++ cmMakefileTargetGenerator.cxx	2 Aug 2007 13:37:10 -0000	1.66
@@ -327,6 +327,7 @@
     this->ExtraContent.insert(obj);
     }
   this->Objects.push_back(obj);
+  this->CleanFiles.push_back(obj);
 
   // TODO: Remove
   //std::string relativeObj