Do dependency discovery in a single pass

[builder.git] / source / objectfile.cpp

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index f24d028d62e56ce25078f8d35e85eb75c9335ca9..39372a415c0e67350d0a4862282a74e489dd213e 100644 (file)
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -19,19 +19,11 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &s):
 
 void ObjectFile::find_depends()
 {
-       for(Dependencies::iterator i=new_deps.begin(); i!=new_deps.end();)
+       for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
-               Target *tgt = *i;
-               if(tgt->get_depends_ready())
-               {
-                       i = new_deps.erase(i);
-                       find_depends(dynamic_cast<FileTarget *>(tgt));
-               }
-               else
-                       ++i;
+               (*i)->prepare();
+               find_depends(dynamic_cast<FileTarget *>(*i));
        }
-
-       deps_ready = new_deps.empty();
 }
 
 
@@ -70,12 +62,6 @@ void ObjectFile::find_depends(FileTarget *tgt)
                        add_depend(*i);
 }
 
-void ObjectFile::add_depend(Target *tgt)
-{
-       Target::add_depend(tgt);
-       new_deps.push_back(tgt);
-}
-
 FS::Path ObjectFile::generate_target_path(const Component &comp, const string &src)
 {
        const SourcePackage &pkg = comp.get_package();