Change arch and prefix to global options

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 57866aa274565c3b088f285abb1b2c234223f8bf..af1c04a5cf4205be339b86a1e9cead91f8a02f90 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -6,11 +6,12 @@ Distributed under the LGPL
 */
 
 #include <fstream>
+#include <iostream>
 #include <msp/strings/regex.h>
 #include "builder.h"
 #include "component.h"
-#include "package.h"
 #include "sourcefile.h"
+#include "sourcepackage.h"
 
 using namespace std;
 using namespace Msp;
@@ -26,12 +27,18 @@ from Builder.
 */
 void SourceFile::find_depends()
 {
+       if(!comp)
+               return;
+
        DependencyCache &deps_cache=comp->get_package().get_deps_cache();
        if(mtime>deps_cache.get_mtime())
        {
                ifstream in(name.c_str());
                if(!in) return;
 
+               if(builder.get_verbose()>=4)
+                       cout<<"Reading includes from "<<name<<'\n';
+
                Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
                string line;
@@ -45,12 +52,11 @@ void SourceFile::find_depends()
                includes=deps_cache.get_deps(name);
 
        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, arch, path, incpath);
+               Target *hdr=builder.get_header(*i, path, incpath);
                if(hdr)
                        add_depend(hdr);
        }