Move the Component reference to Target and make it a pointer

[builder.git] / source / filetarget.cpp

diff --git a/source/filetarget.cpp b/source/filetarget.cpp
index ad3786c76611d3012adcd154ef6bcfbac3210485..2a60c2986bac2ec89f1454995f89283fe5d973da 100644 (file)
--- a/source/filetarget.cpp
+++ b/source/filetarget.cpp
@@ -10,10 +10,12 @@ using namespace std;
 using namespace Msp;
 
 FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a):
-       Target(b, p, make_name(p, a)),
+       Target(b, make_name(p, a)),
        path(a),
        size(0)
 {
+       package = p;
+
        builder.get_vfs().register_path(path, this);
 
        if(FS::Stat st = FS::lstat(path))
@@ -30,7 +32,7 @@ void FileTarget::touch()
 
 void FileTarget::check_rebuild()
 {
-       if(!buildable)
+       if(!tool)
                return;
 
        if(builder.get_build_all())
@@ -39,24 +41,24 @@ void FileTarget::check_rebuild()
                mark_rebuild("Does not exist");
        else
        {
-               for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !rebuild); ++i)
+               for(Dependencies::iterator i=depends.begin(); (i!=depends.end() && !needs_rebuild()); ++i)
                {
                        FileTarget *ft = dynamic_cast<FileTarget *>(*i);
                        if(ft && ft->get_mtime()>mtime)
                                mark_rebuild((*i)->get_name()+" has changed");
-                       else if((*i)->get_rebuild())
+                       else if((*i)->needs_rebuild())
                                mark_rebuild((*i)->get_name()+" needs rebuilding");
                        else
                        {
                                Target *real = ft->get_real_target();
-                               if(real->get_rebuild())
+                               if(real->needs_rebuild())
                                        mark_rebuild(real->get_name()+" needs rebuilding");
                        }
                }
        }
 
        const SourcePackage *spkg = dynamic_cast<const SourcePackage *>(package);
-       if(!rebuild && spkg && spkg->get_config().get_mtime()>mtime)
+       if(!needs_rebuild() && spkg && spkg->get_config().get_mtime()>mtime)
                mark_rebuild("Package options changed");
 }