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

diff --git a/source/objectfile.cpp b/source/objectfile.cpp
index d29cd11..8fbbed1 100644
--- a/source/objectfile.cpp
+++ b/source/objectfile.cpp
@@ -1,7 +1,9 @@
+#include <msp/algo.h>
 #include <msp/path/utils.h>
 #include "builder.h"
 #include "compile.h"
 #include "component.h"
+#include "install.h"
 #include "objectfile.h"
 #include "package.h"
 #include "sourcefile.h"
@@ -17,11 +19,58 @@ ObjectFile::ObjectFile(Builder &b, const Component &c, SourceFile &src):
 	add_depend(&src);
 }
 
+void ObjectFile::find_depends()
+{
+	for(list<Target *>::iterator i=new_deps.begin(); i!=new_deps.end();)
+	{
+		Target *tgt=*i;
+		if(tgt->get_depends_ready())
+		{
+			i=new_deps.erase(i);
+			find_depends(tgt);
+		}
+		else
+			++i;
+	}
+
+	deps_ready=new_deps.empty();
+}
+
 Action *ObjectFile::build()
 {
 	return Target::build(new Compile(builder, depends.front()->get_name(), name, comp));
 }
 
+void ObjectFile::find_depends(Target *tgt)
+{
+	const string &tname=tgt->get_name();
+	string path=tname.substr(0, tname.rfind('/'));
+
+	SourceFile *src=dynamic_cast<SourceFile *>(tgt);
+	if(!src)
+	{
+		Install *inst=dynamic_cast<Install *>(tgt);
+		if(inst)
+			src=dynamic_cast<SourceFile *>(inst->get_depends().front());
+	}
+	if(!src)
+		return;
+
+	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, comp.get_build_info().incpath);
+		if(hdr2 && !contains(depends, hdr2))
+			add_depend(hdr2);
+	}
+}
+
+void ObjectFile::add_depend(Target *tgt)
+{
+	Target::add_depend(tgt);
+	new_deps.push_back(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();