X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fsourcefile.cpp;h=1dcfd2e6b3c7b588088a03d703aa9d3a24224154;hb=69cd5cc73f466181420711fb907979de58687a4c;hp=c4eea79eee84fa2b4c76d18c5f8e3619746513d9;hpb=74266a6e650f019063cdcd1c9a7bd26d8f99041b;p=builder.git

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index c4eea79..1dcfd2e 100644
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,42 +1,13 @@
-#include <fstream>
-#include <msp/regex++/regex++.h>
-#include "builder.h"
 #include "component.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
-using namespace std;
-using namespace Msp;
-
-#include <iostream>
-
-SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
-	Target(b, c?&c->get_package():0, n),
-	comp(c)
+SourceFile::SourceFile(Builder &b, const Msp::FS::Path &p):
+	FileTarget(b, p)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
-void SourceFile::find_depends()
+SourceFile::SourceFile(Builder &b, const Component &c, const Msp::FS::Path &p):
+	FileTarget(b, c.get_package(), p)
 {
-	ifstream in(name.c_str());
-	if(!in) return;
-
-	Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
-
-	string line;
-	while(getline(in, line))
-		if(RegMatch match=r_include.match(line))
-			includes.push_back(match[1].str());
-
-	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);
-		if(hdr)
-			add_depend(hdr);
-	}
-
-	deps_ready=true;
+	component = &c;
 }