Make BuildInfo able to handle chained dependencies

[builder.git] / source / builder.cpp

diff --git a/source/builder.cpp b/source/builder.cpp
index bd1ee1aa82b523c450faeb6c72357e9d6651fc8d..9c8e27be0aaa6cb3506d53ea22828c6dbc75f22d 100644 (file)
--- a/source/builder.cpp
+++ b/source/builder.cpp
@@ -22,7 +22,7 @@
 #include "gnucxxcompiler.h"
 #include "gnulinker.h"
 #include "header.h"
-#include "install.h"
+#include "installedfile.h"
 #include "misc.h"
 #include "package.h"
 #include "pkgconfig.h"
@@ -507,7 +507,7 @@ int Builder::create_targets()
                if(spkg->get_install_flags()&(SourcePackage::LIB|SourcePackage::INCLUDE))
                {
                        PkgConfig *pc = new PkgConfig(*this, *spkg);
-                       install->add_depend(new Install(*this, *spkg, *pc));
+                       install->add_depend(new InstalledFile(*this, *spkg, *pc));
                }
        }
 
@@ -640,7 +640,7 @@ int Builder::do_clean()
        // Cleaning doesn't care about ordering, so a simpler method can be used
 
        set<Target *> clean_tgts;
-       TargetList queue;
+       list<Target *> queue;
        queue.push_back(get_target("cmdline"));
 
        while(!queue.empty())
@@ -651,8 +651,8 @@ int Builder::do_clean()
                if(tgt->is_buildable() && (tgt->get_package()==main_pkg || clean>=2))
                        clean_tgts.insert(tgt);
 
-               const TargetList &deps = tgt->get_depends();
-               for(TargetList::const_iterator i=deps.begin(); i!=deps.end(); ++i)
+               const Target::Dependencies &deps = tgt->get_depends();
+               for(list<Target *>::const_iterator i=deps.begin(); i!=deps.end(); ++i)
                        if(!clean_tgts.count(*i))
                                queue.push_back(*i);
        }