X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fobjectfile.cpp;h=874f06925e56343c4e9e7ce5afe0911cd3a025e2;hb=1a46151c99a406123c4ddfc797a7841baf3e4cc2;hp=bba701d23bc48ca87d03f42790a78f4640a5f907;hpb=b0eb979b0dc79269cb3bb5bb2e67ef4e80689cfe;p=builder.git

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index bba701d..874f069 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -21,7 +21,7 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
 
 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,7 +38,7 @@ 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));
 }
 
 void ObjectFile::find_depends(Target *tgt)
@@ -59,7 +59,7 @@ void ObjectFile::find_depends(Target *tgt)
 	const list<string> &includes=src->get_includes();
 	for(list<string>::const_iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr2=builder.get_header(*i, path, package->get_build_info().incpath);
+		Target *hdr2=builder.get_header(*i, path, comp.get_build_info().incpath);
 		if(hdr2 && !contains(depends, hdr2))
 			add_depend(hdr2);
 	}