X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=3f4ba2019f32a835449d72ce336f0f08076573d7;hb=57bdb055acb0453c75b22cb64f35cc0e817a2827;hp=8fbbed1913539bbee8718fef4549a028c8483ae6;hpb=e71eaecb9a31304fe5e096ea29660ea25c1bfa9f;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index 8fbbed1..3f4ba20 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -19,9 +19,15 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
 	add_depend(&src);
 }
 
+/**
+Processes as many new dependences as possible.  Some may be left unprocessed
+if their own dependencies are not ready, requiring another call to this
+function.  Use the get_deps_ready() function to determine whether this is the
+case.
+*/
 void ObjectFile::find_depends()
 {
-	for(list<Target *>::iterator i=new_deps.begin(); i!=new_deps.end();)
+	for(TargetList::iterator i=new_deps.begin(); i!=new_deps.end();)
 	{
 		Target *tgt=*i;
 		if(tgt->get_depends_ready())
@@ -38,9 +44,12 @@ void ObjectFile::find_depends()
 
 Action *ObjectFile::build()
 {
-	return Target::build(new Compile(builder, depends.front()->get_name(), name, comp));
+	return Target::build(new Compile(builder, *this));
 }
 
+/**
+Recursively looks for header targets and adds them as dependencies.
+*/
 void ObjectFile::find_depends(Target *tgt)
 {
 	const string &tname=tgt->get_name();
@@ -65,6 +74,9 @@ void ObjectFile::find_depends(Target *tgt)
 	}
 }
 
+/**
+Adds a target to the dependency list as well as the new dependencies list.
+*/
 void ObjectFile::add_depend(Target *tgt)
 {
 	Target::add_depend(tgt);
@@ -73,5 +85,5 @@ void ObjectFile::add_depend(Target *tgt)
 
 string ObjectFile::generate_target_name(const Component &comp, const string &src)
 {
-	return (comp.get_package().get_source()/"temp"/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
+	return (comp.get_package().get_temp_dir()/comp.get_name()/(Path::splitext(src.substr(src.rfind('/')+1)).base+".o")).str();
 }