X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcsourcefile.cpp;h=d4f6d79df9e0a0e2116d4d3ed6548d00c58b6337;hb=24af1ff16ad1584ee10ef7b9798f340048c5dfff;hp=ca061d2b19e581ccdc1f6f308c2848533f8135c9;hpb=93c0466ccf46aa3d43541a1aa6a75192d237b3eb;p=builder.git

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index ca061d2..d4f6d79 100644
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -22,6 +22,16 @@ CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
 		install_location = FS::Path("include")/package->get_name();
 }
 
+void CSourceFile::parse_includes(IO::Base &in)
+{
+	static Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
+
+	string line;
+	while(in.getline(line))
+		if(RegMatch match = r_include.match(line))
+			includes.push_back(match[1].str);
+}
+
 void CSourceFile::find_dependencies()
 {
 	if(!component || !mtime)
@@ -38,31 +48,27 @@ void CSourceFile::find_dependencies()
 
 		builder.get_logger().log("files", format("Reading includes from %s", path.str()));
 
-		Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
-
-		string line;
-		while(in.getline(line))
-			if(RegMatch match = r_include.match(line))
-				includes.push_back(match[1].str);
-
+		parse_includes(in);
 		cache.set_values(this, "includes", includes);
 	}
 
-	const BuildInfo::PathList &incpath = component->get_build_info().incpath;
+	const BuildInfo &build_info = component->get_build_info_for_path(path);
+	const BuildInfo::PathList &incpath = build_info.incpath;
 	BuildInfo::PathList local_incpath = incpath;
+	local_incpath.insert(local_incpath.begin(), build_info.local_incpath.begin(), build_info.local_incpath.end());
 	local_incpath.push_front(FS::dirname(path).str());
 
 	for(IncludeList::iterator i=includes.begin(); i!=includes.end(); ++i)
 	{
 		Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
 		if(hdr)
-			add_dependency(*hdr);
+			add_transitive_dependency(*hdr);
 	}
 }
 
 void CSourceFile::modified()
 {
 	includes.clear();
-	depends.clear();
+	trans_depends.clear();
 	find_dependencies();
 }