diff options
| -rw-r--r-- | Source/cmGlobalUnixMakefileGenerator3.cxx | 1 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.cxx | 25 | ||||
| -rw-r--r-- | Source/cmLocalUnixMakefileGenerator3.h | 3 |
3 files changed, 0 insertions, 29 deletions
diff --git a/Source/cmGlobalUnixMakefileGenerator3.cxx b/Source/cmGlobalUnixMakefileGenerator3.cxx index 234f0d0..c702742 100644 --- a/Source/cmGlobalUnixMakefileGenerator3.cxx +++ b/Source/cmGlobalUnixMakefileGenerator3.cxx @@ -605,7 +605,6 @@ std::string cmGlobalUnixMakefileGenerator3 } tname = lg->Convert(tname.c_str(),cmLocalGenerator::HOME_OUTPUT, cmLocalGenerator::MAKEFILE); - tname = lg->ConvertToMakeTarget(tname.c_str()); makeCommand += tname.c_str(); makeCommand += "\""; if (!this->LocalGenerators.size()) diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx index 0f01d90..d3a2f2e 100644 --- a/Source/cmLocalUnixMakefileGenerator3.cxx +++ b/Source/cmLocalUnixMakefileGenerator3.cxx @@ -564,7 +564,6 @@ cmLocalUnixMakefileGenerator3 // Construct the left hand side of the rule. replace = target; std::string tgt = this->Convert(replace.c_str(),HOME_OUTPUT,MAKEFILE); - tgt = this->ConvertToMakeTarget(tgt.c_str()); const char* space = ""; if(tgt.size() == 1) { @@ -598,7 +597,6 @@ cmLocalUnixMakefileGenerator3 { replace = *dep; replace = this->Convert(replace.c_str(),HOME_OUTPUT,MAKEFILE); - replace = this->ConvertToMakeTarget(replace.c_str()); os << tgt.c_str() << space << ": " << replace.c_str() << "\n"; } } @@ -1090,28 +1088,6 @@ cmLocalUnixMakefileGenerator3::AppendEcho(std::vector<std::string>& commands, } //---------------------------------------------------------------------------- -//take a tgt path and convert it into a make target, it could be full, or -//relative -std::string cmLocalUnixMakefileGenerator3 -::ConvertToMakeTarget(const char* tgt) -{ - // Make targets should not have a leading './' for a file in the - // directory containing the makefile. - std::string ret = tgt; - if(ret.size() > 2 && (ret[0] == '.') && - ( (ret[1] == '/') || ret[1] == '\\')) - { - std::string upath = ret; - cmSystemTools::ConvertToUnixSlashes(upath); - if(upath.find(2, '/') == upath.npos) - { - ret = ret.substr(2, ret.size()-2); - } - } - return ret; -} - -//---------------------------------------------------------------------------- std::string cmLocalUnixMakefileGenerator3 ::CreateMakeVariable(const char* sin, const char* s2in) @@ -1770,7 +1746,6 @@ cmLocalUnixMakefileGenerator3 if (tgt && tgt[0] != '\0') { std::string tgt2 = this->Convert(tgt,HOME_OUTPUT,MAKEFILE); - tgt2 = this->ConvertToMakeTarget(tgt2.c_str()); // for make -f foo bar, foo is a file but bar (tgt2) is // a make target. make targets should be escaped with "" // and not \, so if we find a "\ " in the path then remove diff --git a/Source/cmLocalUnixMakefileGenerator3.h b/Source/cmLocalUnixMakefileGenerator3.h index e00ed25..bf90605 100644 --- a/Source/cmLocalUnixMakefileGenerator3.h +++ b/Source/cmLocalUnixMakefileGenerator3.h @@ -186,9 +186,6 @@ public: std::string CreateMakeVariable(const char* sin, const char* s2in); - // cleanup the name of a potential target - std::string ConvertToMakeTarget(const char* tgt); - /** Called from command-line hook to scan dependencies. */ virtual bool ScanDependencies(const char* tgtInfo); |