X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=f17b88e103c6a8a3725d079ecaf046339b1c0824;hb=be8a901dfc026f61db46d5d64a41cecc619bc97d;hp=fa63ac4e5154293050db87c91168d4c286690938;hpb=654de39b62a9a58fd8e1b5a557361d628345788b;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index fa63ac4..f17b88e 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -68,6 +68,28 @@ void Target::prepare()
 
 }
 
+Action *Target::build()
+{
+	if(!buildable)
+	{
+		rebuild=false;
+		return 0;
+	}
+
+	if(!builder.get_dry_run() && exists(name))
+		unlink(name);
+
+	Action *action=create_action();
+	if(action)
+	{
+		action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
+
+		building=true;
+	}
+
+	return action;
+}
+
 /**
 Returns the number of targets that need to be rebuilt in order to get this
 target up-to-date.
@@ -106,7 +128,7 @@ Target::Target(Builder &b, const Package *p, const string &n):
 	builder.add_target(this);
 
 	struct stat st;
-	if(!Path::stat(name, st))
+	if(!stat(name, st))
 		mtime=Time::TimeStamp::from_unixtime(st.st_mtime);
 }
 
@@ -133,9 +155,9 @@ void Target::check_rebuild()
 		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");
+				mark_rebuild(basename((*i)->get_name())+" has changed");
 			else if((*i)->get_rebuild())
-				mark_rebuild(Path::basename((*i)->get_name())+" needs rebuilding");
+				mark_rebuild(basename((*i)->get_name())+" needs rebuilding");
 		}
 	}
 
@@ -144,17 +166,6 @@ void Target::check_rebuild()
 		mark_rebuild("Package options changed");
 }
 
-/**
-Hooks the target up with the given action, then returns it.  This should be
-called from the public build() function of buildable targets.
-*/
-Action *Target::build(Action *action)
-{
-	building=true;
-	action->signal_done.connect(sigc::mem_fun(this, &Target::build_done));
-	return action;
-}
-
 /**
 Handles for the build_done signal of Action.
 */