X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Ftarget.cpp;h=adde0cd180727b8ceb0a18d46455c60e3cf1f244;hb=7e5ac6af8987bf12f3e338d00e96e8cb74f3534b;hp=6ba64717e4272405fb79b8a008df471dd9f57b4c;hpb=338eefb513953ae55e8e3614c009c242ba8ad74e;p=builder.git

diff --git a/source/target.cpp b/source/target.cpp
index 6ba6471..adde0cd 100644
--- a/source/target.cpp
+++ b/source/target.cpp
@@ -15,7 +15,6 @@ Target::Target(Builder &b, const Package *p, const string &n):
 	package(p),
 	name(n),
 	tool(0),
-	buildable(false),
 	building(false),
 	rebuild(false),
 	deps_ready(false),
@@ -31,7 +30,7 @@ Target *Target::get_buildable_target()
 		return 0;
 
 	bool self_ok = !building;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 	{
 		Target *tgt = (*i)->get_buildable_target();
 		if(tgt)
@@ -69,7 +68,7 @@ void Target::prepare()
 	}
 
 	preparing = true;
-	for(TargetList::iterator i=depends.begin(); i!=depends.end(); ++i)
+	for(Dependencies::iterator i=depends.begin(); i!=depends.end(); ++i)
 		(*i)->prepare();
 
 	check_rebuild();
@@ -79,13 +78,11 @@ void Target::prepare()
 
 Task *Target::build()
 {
-	if(!buildable)
+	if(!tool)
 	{
 		rebuild = false;
 		return 0;
 	}
-	if(!tool)
-		throw logic_error("buildable && !tool");
 
 	// XXX Minor breach of OO here
 	if(FileTarget *ft = dynamic_cast<FileTarget *>(this))