Add support for statically linking the C++ standard library

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 55910a64823742b12f45b259289ebae5270daa6c..1dcfd2e6b3c7b588088a03d703aa9d3a24224154 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,34 +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;
-
-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)
 { }
 
-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);
-       }
+       component = &c;
 }