diff options
author | marha <marha@users.sourceforge.net> | 2010-10-31 19:30:18 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-10-31 19:30:18 +0000 |
commit | b320c441ab5ad04ea4a6766d0a178fc7c0ea4105 (patch) | |
tree | 22df141d642b128edbcf9dfb6715e69eaf42e391 /tools/mhmake/src/fileinfo.h | |
parent | 75ef19188d021a5e965198bde774c1c33bedc1f3 (diff) | |
download | vcxsrv-b320c441ab5ad04ea4a6766d0a178fc7c0ea4105.tar.gz vcxsrv-b320c441ab5ad04ea4a6766d0a178fc7c0ea4105.tar.bz2 vcxsrv-b320c441ab5ad04ea4a6766d0a178fc7c0ea4105.zip |
Make sure implicit rule searching is taking the extra dependencies into account
Diffstat (limited to 'tools/mhmake/src/fileinfo.h')
-rw-r--r-- | tools/mhmake/src/fileinfo.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/tools/mhmake/src/fileinfo.h b/tools/mhmake/src/fileinfo.h index bb5e0ce71..1d70f0df1 100644 --- a/tools/mhmake/src/fileinfo.h +++ b/tools/mhmake/src/fileinfo.h @@ -257,6 +257,7 @@ public: void InsertDeps(vector<fileinfo*> &Deps)
{
+ #ifdef _DEBUG
vector<fileinfo*> NewDeps;
vector<fileinfo*>::const_iterator It=Deps.begin();
vector<fileinfo*>::const_iterator ItEnd=Deps.end();
@@ -274,17 +275,9 @@ public: }
if (NewDeps.size())
m_Deps.insert(m_Deps.begin(),NewDeps.begin(),NewDeps.end());
- }
- void AddMainDep(fileinfo* pMainDep)
- {
- if (&*pMainDep==this)
- {
- #ifdef _DEBUG
- cout << GetQuotedFullFileName()<<" is directly dependent on itself\n";
- #endif
- return;
- }
- m_Deps.insert(m_Deps.begin(),pMainDep);
+ #else
+ m_Deps.insert(m_Deps.begin(),Deps.begin(),Deps.end());
+ #endif
}
vector<fileinfo*> &GetDeps(void)
{
|