summaryrefslogtreecommitdiffstats
path: root/Source/cmUnixMakefileGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2001-07-17 19:09:16 (GMT)
committerBrad King <brad.king@kitware.com>2001-07-17 19:09:16 (GMT)
commit82c1916a6d1c5f01bece5d773b9739b5d546a594 (patch)
tree480a61427d133fcda0114f8e9609fe8d91ba952b /Source/cmUnixMakefileGenerator.cxx
parentc5381e85885c289d0669d5f3ddb5e3d2d3d2e5dd (diff)
downloadCMake-82c1916a6d1c5f01bece5d773b9739b5d546a594.zip
CMake-82c1916a6d1c5f01bece5d773b9739b5d546a594.tar.gz
CMake-82c1916a6d1c5f01bece5d773b9739b5d546a594.tar.bz2
ENH: Hacked together a new implementation of the dependency generator code. This should support finding dependencies for individual files without doing them for the entire makefile. Use cmMakeDepend::FindDependencies() to do this.
Diffstat (limited to 'Source/cmUnixMakefileGenerator.cxx')
-rw-r--r--Source/cmUnixMakefileGenerator.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/cmUnixMakefileGenerator.cxx b/Source/cmUnixMakefileGenerator.cxx
index b5799d6..5a93a38 100644
--- a/Source/cmUnixMakefileGenerator.cxx
+++ b/Source/cmUnixMakefileGenerator.cxx
@@ -95,7 +95,7 @@ void cmUnixMakefileGenerator::GenerateMakefile()
// Generate depends
cmMakeDepend md;
md.SetMakefile(m_Makefile);
- md.GenerateDependInformation();
+ md.GenerateMakefileDependencies();
this->ProcessDepends(md);
// output the makefile fragment
this->OutputMakefile("Makefile");
@@ -124,15 +124,15 @@ void cmUnixMakefileGenerator::ProcessDepends(const cmMakeDepend &md)
// Now add the real dependencies for the file.
if (info)
{
- for( cmDependInformation::IndexSet::const_iterator indx =
- info->m_IndexSet.begin();
- indx != info->m_IndexSet.end(); ++indx)
+ for(cmDependInformation::DependencySet::const_iterator d =
+ info->m_DependencySet.begin();
+ d != info->m_DependencySet.end(); ++d)
{
// Make sure the full path is given. If not, the dependency was
// not found.
- if(md.GetDependInformation()[*indx]->m_FullPath != "")
+ if((*d)->m_FullPath != "")
{
- i->GetDepends().push_back(md.GetDependInformation()[*indx]->m_FullPath);
+ i->GetDepends().push_back((*d)->m_FullPath);
}
}
}