Make Target::add_depend take a reference since null is not allowed

[builder.git] / source / csourcefile.cpp

diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp
index 824027890fa940c36c0bcd47de0f3bdc1adcbcfa..b0346e46cd01d94dc5d57ef01daf2823f8bb37cb 100644 (file)
--- a/source/csourcefile.cpp
+++ b/source/csourcefile.cpp
@@ -19,7 +19,7 @@ CSourceFile::CSourceFile(Builder &b, const Component &c, const FS::Path &p):
 {
        string ext = FS::extpart(FS::basename(path));
        if(ext==".h" || ext==".H" || ext==".hpp")
-               install_location = "include/"+component->get_name();
+               install_location = FS::Path("include")/package->get_name();
 }
 
 void CSourceFile::find_depends()
@@ -57,6 +57,6 @@ void CSourceFile::find_depends()
        {
                Target *hdr = builder.get_vfs().find_header(i->substr(1), ((*i)[0]=='"' ? local_incpath : incpath));
                if(hdr)
-                       add_depend(hdr);
+                       add_depend(*hdr);
        }
 }