Convert to the rewritten getopt++

[builder.git] / source / virtualtarget.cpp

diff --git a/source/virtualtarget.cpp b/source/virtualtarget.cpp
index 5c1e4c71a88d569b5392577edd7573e95e9e730e..4a272a7b70de442d3fe5756f3a0733b42040b295 100644 (file)
--- a/source/virtualtarget.cpp
+++ b/source/virtualtarget.cpp
@@ -1,10 +1,22 @@
+#include <msp/path/utils.h>
 #include "virtualtarget.h"
 
 using namespace std;
 
+/**
+Virtual targets are only rebuilt if their dependencies need rebuilding.
+*/
 void VirtualTarget::check_rebuild()
 {
-       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_rebuild())
-                       mark_rebuild((*i)->get_name()+" needs rebuilding");
+                       mark_rebuild(Msp::Path::basename((*i)->get_name())+" needs rebuilding");
+}
+
+/**
+Don't count virtual targets since "building" them causes no action.
+*/
+unsigned VirtualTarget::count_rebuild()
+{
+       return Target::count_rebuild()-rebuild;
 }