Rework the Target class hierarchy

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index cf74356e72331e3f1a84c68f2afabc174f518d00..cadd1330e0bc94b2816e6b26268b5d0a195e5efb 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of builder
-Copyright © 2006-2007 Mikko Rasa, Mikkosoft Productions
+Copyright © 2006-2009  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -17,15 +17,11 @@ Distributed under the LGPL
 using namespace std;
 using namespace Msp;
 
-SourceFile::SourceFile(Builder &b, const Component *c, const string &n):
-       Target(b, c?&c->get_package():0, n),
+SourceFile::SourceFile(Builder &b, const Component *c, const FS::Path &p):
+       FileTarget(b, (c ? &c->get_package() : 0), p),
        comp(c)
 { }
 
-/**
-Parses include directives from the file and looks up the appropriate targets
-from Builder.
-*/
 void SourceFile::find_depends()
 {
        if(!comp)
@@ -72,7 +68,7 @@ void SourceFile::find_depends()
 
        const StringList &incpath=comp->get_build_info().incpath;
 
-       string path=name.substr(0, name.rfind('/'));
+       FS::Path dir=FS::dirname(path);
        for(list<string>::iterator i=includes.begin(); i!=includes.end(); ++i)
        {
                Target *hdr=builder.get_header(*i, path, incpath);