Code reorganizing and cleanup

[builder.git] / source / target.cpp

diff --git a/source/target.cpp b/source/target.cpp
index d55202289dfd026fb1893a3c83abd8f1cd34f670..e03428837838afdbd78447862075f4db66d082b6 100644 (file)
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -11,7 +11,7 @@ using namespace Msp;
 Target *Target::get_buildable_target()
 {
        bool self_ok=true;
-       for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
        {
                Target *tgt=(*i)->get_buildable_target();
                if(tgt)
@@ -37,7 +37,7 @@ void Target::prepare()
        if(prepared)
                return;
 
-       for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
                (*i)->prepare();
 
        check_rebuild();
@@ -50,7 +50,7 @@ unsigned Target::count_rebuild()
 
        counted=true;
        unsigned count=rebuild;
-       for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
+       for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
                count+=(*i)->count_rebuild();
        return count;
 }
@@ -64,11 +64,11 @@ Target::Target(Builder &b, const Package *p, const string &n):
        builder(b),
        package(p),
        name(n),
+       buildable(false),
        building(false),
        rebuild(false),
        deps_ready(false),
        prepared(false),
-       buildable(false),
        counted(false)
 {
        struct stat st;
@@ -93,7 +93,7 @@ void Target::check_rebuild()
                mark_rebuild("Does not exist");
        else
        {
-               for(list<Target *>::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+               for(TargetList::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
                {
                        if((*i)->get_mtime()>mtime)
                                mark_rebuild(Path::basename((*i)->get_name())+" has changed");