X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ffiletarget.cpp;h=62265b0d9c956bbdaf644192f0a5f428ecb483ee;hb=f1027d55894e624df4888f9545f1e690a2adf5ae;hp=2a60c2986bac2ec89f1454995f89283fe5d973da;hpb=632361796a7ddadf8a726526c937fab22281fb7b;p=builder.git diff --git a/source/filetarget.cpp b/source/filetarget.cpp index 2a60c29..62265b0 100644 --- a/source/filetarget.cpp +++ b/source/filetarget.cpp @@ -10,7 +10,7 @@ using namespace std; using namespace Msp; FileTarget::FileTarget(Builder &b, const Package *p, const FS::Path &a): - Target(b, make_name(p, a)), + Target(b, generate_name(p, a)), path(a), size(0) { @@ -48,12 +48,6 @@ void FileTarget::check_rebuild() mark_rebuild((*i)->get_name()+" has changed"); else if((*i)->needs_rebuild()) mark_rebuild((*i)->get_name()+" needs rebuilding"); - else - { - Target *real = ft->get_real_target(); - if(real->needs_rebuild()) - mark_rebuild(real->get_name()+" needs rebuilding"); - } } } @@ -62,7 +56,7 @@ void FileTarget::check_rebuild() mark_rebuild("Package options changed"); } -string FileTarget::make_name(const Package *pkg, const FS::Path &pth) +string FileTarget::generate_name(const Package *pkg, const FS::Path &pth) { if(const SourcePackage *spkg = dynamic_cast(pkg)) {