X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;ds=sidebyside;f=source%2Fcsourcefile.cpp;h=7a26bb5ff4c503b0072eb9ed5bde9e3e25d15bdb;hb=a5b439969c06a4794a3914580a29256773f24778;hp=0ff4286c5cb87bb6270a5978c304c8969c29bed0;hpb=ca18323d45d67243773b03668e79c715aa976441;p=builder.git diff --git a/source/csourcefile.cpp b/source/csourcefile.cpp index 0ff4286..7a26bb5 100644 --- a/source/csourcefile.cpp +++ b/source/csourcefile.cpp @@ -19,15 +19,15 @@ 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/"+comp->get_name(); + install_location = "include/"+component->get_name(); } void CSourceFile::find_depends() { - if(!comp || !mtime) + if(!component || !mtime) return; - const SourcePackage &spkg = comp->get_package(); + const SourcePackage &spkg = component->get_package(); string relname = FS::relative(path, spkg.get_source()).str(); DependencyCache &deps_cache = spkg.get_deps_cache(); @@ -49,7 +49,7 @@ void CSourceFile::find_depends() deps_cache.set_deps(relname, includes); } - const BuildInfo::PathList &incpath = comp->get_build_info().incpath; + const BuildInfo::PathList &incpath = component->get_build_info().incpath; BuildInfo::PathList local_incpath = incpath; local_incpath.push_front(FS::dirname(path).str());