1 files changed, 12 insertions, 19 deletions

diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx
index c999106ebc..03b0cd23ab 100644
--- a/Source/cmMakefileExecutableTargetGenerator.cxx
+++ b/Source/cmMakefileExecutableTargetGenerator.cxx
@@ -22,6 +22,7 @@
 #include "cmMakefile.h"
 #include "cmSourceFile.h"
 #include "cmTarget.h"
+#include "cmake.h"
 
 //----------------------------------------------------------------------------
 void cmMakefileExecutableTargetGenerator::WriteRuleFiles()
@@ -29,12 +30,15 @@ void cmMakefileExecutableTargetGenerator::WriteRuleFiles()
   // create the build.make file and directory, put in the common blocks
   this->CreateRuleFile();
 
-  // Add in any rules for custom commands
-  this->WriteCustomCommandsForTarget();
-
-  // write in rules for object files
+  // write rules used to help build object files
   this->WriteCommonCodeRules();
 
+  // write in rules for object files and custom commands
+  this->WriteTargetBuildRules();
+
+  // write the per-target per-language flags
+  this->WriteTargetLanguageFlags();
+
   // Write the dependency generation rule.
   this->WriteTargetDependRules();
 
@@ -165,7 +169,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
   if(relink)
     {
     outpath = this->Makefile->GetStartOutputDirectory();
-    outpath += "/CMakeFiles/CMakeRelink.dir";
+    outpath += cmake::GetCMakeFilesDirectory();
+    outpath += "/CMakeRelink.dir";
     cmSystemTools::MakeDirectory(outpath.c_str());
     outpath += "/";
     }
@@ -311,7 +316,6 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
     symlink += targetOutPathReal;
     symlink += " ";
     symlink += targetOutPath;
-    commands.push_back(symlink);
     commands1.clear();
     commands1.push_back(symlink);
     this->LocalGenerator->CreateCDCommand(commands1,
@@ -380,19 +384,8 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink)
                                         depends, commands, false);
     }
 
-  // Write convenience targets.
-  std::string dir = this->Makefile->GetStartOutputDirectory();
-  dir += "/";
-  dir += this->LocalGenerator->GetTargetDirectory(*this->Target);
-  std::string buildTargetRuleName = dir;
-  buildTargetRuleName += relink?"/preinstall":"/build";
-  buildTargetRuleName =
-    this->Convert(buildTargetRuleName.c_str(),
-                  cmLocalGenerator::HOME_OUTPUT,
-                  cmLocalGenerator::MAKEFILE);
-  this->LocalGenerator->WriteConvenienceRule(*this->BuildFileStream,
-                                             targetFullPath.c_str(),
-                                             buildTargetRuleName.c_str());
+  // 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.
   this->CleanFiles.insert(this->CleanFiles.end(),