Make the name of a FileTarget be its basename instead of full path

[builder.git] / source / sourcefile.cpp

diff --git a/source/sourcefile.cpp b/source/sourcefile.cpp
index 3a1941af4b76b8ea41266ef6d237bdf846e10962..d95ea5edc5f3678d1f1c0eb1926a50866ab22311 100644 (file)
--- a/source/sourcefile.cpp
+++ b/source/sourcefile.cpp
@@ -36,7 +36,7 @@ void SourceFile::find_depends()
        }
 
        const SourcePackage &spkg = comp->get_package();
-       string relname = FS::relative(name, spkg.get_source()).str();
+       string relname = FS::relative(path, spkg.get_source()).str();
        DependencyCache &deps_cache = spkg.get_deps_cache();
        bool deps_found = false;
        if(mtime<deps_cache.get_mtime())
@@ -54,10 +54,10 @@ void SourceFile::find_depends()
        {
                try
                {
-                       IO::BufferedFile in(name);
+                       IO::BufferedFile in(path.str());
 
                        if(builder.get_verbose()>=4)
-                               IO::print("Reading includes from %s\n", name);
+                               IO::print("Reading includes from %s\n", path.str());
 
                        Regex r_include("^[ \t]*#include[ \t]+([\"<].*)[\">]");
 
@@ -70,7 +70,9 @@ void SourceFile::find_depends()
                }
                catch(const IO::FileNotFound &)
                {
-                       // XXX WTF?
+                       if(builder.get_verbose()>=4)
+                               IO::print("Failed to read includes from %s\n", path.str());
+                       deps_ready = true;
                        return;
                }
        }