X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=7be7889974c4733faf923b8be4b9563a4f970d50;hb=445edbc3c42bbd7880cc414cf153ddfd196bfc1c;hp=42142536607b9a4540929703ae14383538823ea8;hpb=59ac0a44d6edf179c01604c6ced744873213f855;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 4214253..7be7889 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,7 +1,8 @@
 #include <fstream>
-#include <msp/regex++/regex++.h>
+#include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
+#include "package.h"
 #include "sourcefile.h"
 
 using namespace std;
@@ -12,6 +13,10 @@ SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
 	comp(c)
 { }
 
+/**
+Parses include directives from the file and looks up the appropriate targets
+from Builder.
+*/
 void SourceFile::find_depends()
 {
 	ifstream in(name.c_str());
@@ -22,19 +27,18 @@ void SourceFile::find_depends()
 	string line;
 	while(getline(in, line))
 		if(RegMatch match=r_include.match(line))
-			includes.push_back(match[1].str());
+			includes.push_back(match[1].str);
+
+	const StringList &incpath=comp->get_build_info().incpath;
+	const string &arch=comp->get_package().get_arch();
 
 	string path=name.substr(0, name.rfind('/'));
 	for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
-		Target *hdr=builder.get_header(*i, path, comp->get_build_info().incpath);
+		Target *hdr=builder.get_header(*i, arch, path, incpath);
 		if(hdr)
 			add_depend(hdr);
 	}
-}
 
-void SourceFile::check_rebuild()
-{
-	for(list<Target *>::iterator i=depends.begin(); i!=depends.end(); ++i)
-		vmtime=max(vmtime, (*i)->get_virtual_mtime());
+	deps_ready=true;
 }